Change the way setup.py req-s are satisfied

Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
conda-forge · Dec 4, 2020 · a0292f3 · a0292f3
1 parent a6faab2
commit a0292f3
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 69 deletions.
diff --git a/recipes/ray-packages/meta.yaml b/recipes/ray-packages/meta.yaml
@@ -8,18 +8,18 @@ source:
   url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz
   sha256: e08ff04dc8bca99527dbc821446f8660cfe6cbc8c35db61410958b9aa9acee56
   patches:
-    - patches/0001-Remove-setup-and-install-requirements-installed-by-c.patch
-    - patches/0002-Do-not-force-pickle5-in-sys.path.patch
-    - patches/0003-Fix-redis-build-for-non-default-compiler-drivers.patch
-    - patches/0004-Fix-plasma-linking-for-ancient-glibc.patch
-    - patches/0005-Redis-deps-now-build-but-do-not-link.patch
-    - patches/0006-Disable-making-non-core-entry-scripts.patch
-    - patches/0007-Ignore-warnings-for-one-file.patch
-    - patches/0008-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch
-    - patches/0009-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch
-    - patches/0010-Convert-symlinks-to-junctions-on-Windows-before-buil.patch
-    - patches/0011-Add-workaround-for-os.path.isdir-on-Windows.patch
-    - patches/0012-Include-process.h-for-getpid-explicitly-on-Windows.patch
+    - patches/0001-Do-not-force-pickle5-in-sys.path.patch
+    - patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch
+    - patches/0003-Fix-plasma-linking-for-ancient-glibc.patch
+    - patches/0004-Redis-deps-now-build-but-do-not-link.patch
+    - patches/0005-Disable-making-non-core-entry-scripts.patch
+    - patches/0006-Ignore-warnings-for-one-file.patch
+    - patches/0007-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch
+    - patches/0008-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch
+    - patches/0009-Convert-symlinks-to-junctions-on-Windows-before-buil.patch
+    - patches/0010-Add-workaround-for-os.path.isdir-on-Windows.patch
+    - patches/0011-Include-process.h-for-getpid-explicitly-on-Windows.patch
+    - patches/0012-Empty-install-requirements-installed-by-conda-build.patch
 
 build:
   number: 0
@@ -98,8 +98,8 @@ outputs:
         - colorful
         - filelock
         - googlesearch
-        # gpustat-0.6.0 has a dependency which does not exist on Windows
-        # skip it there as it is optional until gpustat is fixed
+        # gpustat-0.6.0 has a dependency which does not exist on Windows;
+        # skip it there until gpustat is fixed as it is optional
         - gpustat  # [not win]
         - grpcio >=1.28.1
         - jsonschema

diff --git a/...02-Do-not-force-pickle5-in-sys.path.patch → ...01-Do-not-force-pickle5-in-sys.path.patch b/...02-Do-not-force-pickle5-in-sys.path.patch → ...01-Do-not-force-pickle5-in-sys.path.patch
@@ -1,7 +1,7 @@
-From d24d3390ff8224ca7fd288604aace04ac36629f4 Mon Sep 17 00:00:00 2001
+From 67ede055dd435c47cddc502332e047071de03d64 Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Thu, 5 Nov 2020 12:04:25 +0300
-Subject: [PATCH 02/12] Do not force pickle5 in sys.path
+Subject: [PATCH 01/12] Do not force pickle5 in sys.path
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/recipes/ray-packages/patches/0001-Remove-setup-and-install-requirements-installed-by-c.patch b/recipes/ray-packages/patches/0001-Remove-setup-and-install-requirements-installed-by-c.patch
diff --git a/...ld-for-non-default-compiler-drivers.patch → ...ld-for-non-default-compiler-drivers.patch b/...ld-for-non-default-compiler-drivers.patch → ...ld-for-non-default-compiler-drivers.patch
@@ -1,7 +1,7 @@
-From 158d16e4f2d59ca285b726182fa034197bcbaad0 Mon Sep 17 00:00:00 2001
+From 5d84aed7082a6e22256d7128a417f98aaa2dd43e Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Thu, 5 Nov 2020 17:05:44 +0300
-Subject: [PATCH 03/12] Fix redis build for non-default compiler drivers
+Subject: [PATCH 02/12] Fix redis build for non-default compiler drivers
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/...ix-plasma-linking-for-ancient-glibc.patch → ...ix-plasma-linking-for-ancient-glibc.patch b/...ix-plasma-linking-for-ancient-glibc.patch → ...ix-plasma-linking-for-ancient-glibc.patch
@@ -1,7 +1,7 @@
-From 3008588f34a2ddd5cf36ea33fa20f0e399a14af2 Mon Sep 17 00:00:00 2001
+From ac6d6bdfa456303703fb35c0b170ab64bef90ccc Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Thu, 5 Nov 2020 17:09:46 +0300
-Subject: [PATCH 04/12] Fix plasma linking for ancient glibc
+Subject: [PATCH 03/12] Fix plasma linking for ancient glibc
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/...edis-deps-now-build-but-do-not-link.patch → ...edis-deps-now-build-but-do-not-link.patch b/...edis-deps-now-build-but-do-not-link.patch → ...edis-deps-now-build-but-do-not-link.patch
@@ -1,7 +1,7 @@
-From 09c6a6379f0ea313753cd25ce9dfa6c574f47eb6 Mon Sep 17 00:00:00 2001
+From 53c5d197beab5ab586dca99e75e9b3012f771361 Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Fri, 6 Nov 2020 00:55:05 +0300
-Subject: [PATCH 05/12] Redis deps now build but do not link
+Subject: [PATCH 04/12] Redis deps now build but do not link
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/...sable-making-non-core-entry-scripts.patch → ...sable-making-non-core-entry-scripts.patch b/...sable-making-non-core-entry-scripts.patch → ...sable-making-non-core-entry-scripts.patch
@@ -1,18 +1,18 @@
-From cc3e907f8b3be28532296a33aade6f59b2044b85 Mon Sep 17 00:00:00 2001
+From c47b6651ef95e0aed30aebfb5762568b0404c66c Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Tue, 10 Nov 2020 23:26:35 +0300
-Subject: [PATCH 06/12] Disable making non-core entry scripts
+Subject: [PATCH 05/12] Disable making non-core entry scripts
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---
  python/setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index d6b034594..2cf203f20 100644
+index d64d8402e..b0a20062a 100644
 --- a/python/setup.py
 +++ b/python/setup.py
-@@ -460,7 +460,7 @@ setuptools.setup(
+@@ -462,7 +462,7 @@ setuptools.setup(
      entry_points={
          "console_scripts": [
              "ray=ray.scripts.scripts:main",

diff --git a/...s/0007-Ignore-warnings-for-one-file.patch → ...s/0006-Ignore-warnings-for-one-file.patch b/...s/0007-Ignore-warnings-for-one-file.patch → ...s/0006-Ignore-warnings-for-one-file.patch
@@ -1,7 +1,7 @@
-From d6f2729af03a82e3e0e7a7350fa2cd87942afb38 Mon Sep 17 00:00:00 2001
+From 991fd7625fe5bdebc1c486d6936bdb07f710367f Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Wed, 11 Nov 2020 01:08:16 +0300
-Subject: [PATCH 07/12] Ignore warnings for one file
+Subject: [PATCH 06/12] Ignore warnings for one file
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/...t-and-output-dir-right-above-SRC_DI.patch → ...t-and-output-dir-right-above-SRC_DI.patch b/...t-and-output-dir-right-above-SRC_DI.patch → ...t-and-output-dir-right-above-SRC_DI.patch
@@ -1,15 +1,15 @@
-From 7dcb04b40c4fced25ca223186e2f031755e63b1d Mon Sep 17 00:00:00 2001
+From 30440e5c666e4d85851acaf9f097af234cbb1d7c Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 Date: Wed, 18 Nov 2020 18:47:40 +0300
-Subject: [PATCH 08/12] Contain bazel root and output dir right above $SRC_DIR
+Subject: [PATCH 07/12] Contain bazel root and output dir right above $SRC_DIR
 
 Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
 ---
  python/setup.py | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index 2cf203f20..602c3011b 100644
+index b0a20062a..13c1f4b34 100644
 --- a/python/setup.py
 +++ b/python/setup.py
 @@ -294,12 +294,18 @@ def build(build_python, build_java):

diff --git a/...rash-if-BAZEL_SH-not-set-on-Windows.patch → ...rash-if-BAZEL_SH-not-set-on-Windows.patch b/...rash-if-BAZEL_SH-not-set-on-Windows.patch → ...rash-if-BAZEL_SH-not-set-on-Windows.patch
@@ -1,15 +1,15 @@
-From 840581a6aaf81b5fa1cd4c485655d34356bd2951 Mon Sep 17 00:00:00 2001
+From 8e5a3c9b85993f5ec00c8ca350ec932ade63d34a Mon Sep 17 00:00:00 2001
 From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 Date: Fri, 20 Nov 2020 14:17:05 +0300
-Subject: [PATCH 09/12] Do not crash if BAZEL_SH not set on Windows
+Subject: [PATCH 08/12] Do not crash if BAZEL_SH not set on Windows
 
 Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 ---
  python/setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index 602c3011b..4648bda0b 100644
+index 13c1f4b34..024657039 100644
 --- a/python/setup.py
 +++ b/python/setup.py
 @@ -246,7 +246,7 @@ def build(build_python, build_java):

diff --git a/...to-junctions-on-Windows-before-buil.patch → ...to-junctions-on-Windows-before-buil.patch b/...to-junctions-on-Windows-before-buil.patch → ...to-junctions-on-Windows-before-buil.patch
@@ -1,7 +1,7 @@
-From 468fe12ac1faf6f6de90aab5ec01a402c45a9db8 Mon Sep 17 00:00:00 2001
+From fdeefcf7374a5ff1dd3026a607b08efeb0b69b9b Mon Sep 17 00:00:00 2001
 From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 Date: Fri, 20 Nov 2020 15:32:19 +0300
-Subject: [PATCH 10/12] Convert symlinks to junctions on Windows before
+Subject: [PATCH 09/12] Convert symlinks to junctions on Windows before
  building
 
 Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
@@ -10,7 +10,7 @@ Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
  1 file changed, 36 insertions(+)
 
 diff --git a/python/setup.py b/python/setup.py
-index 4648bda0b..3c1d91e0e 100644
+index 024657039..7a225f72d 100644
 --- a/python/setup.py
 +++ b/python/setup.py
 @@ -225,6 +225,41 @@ def download_pickle5(pickle5_dir):

diff --git a/...around-for-os.path.isdir-on-Windows.patch → ...around-for-os.path.isdir-on-Windows.patch b/...around-for-os.path.isdir-on-Windows.patch → ...around-for-os.path.isdir-on-Windows.patch
@@ -1,15 +1,15 @@
-From c4332f87c668c7d88a03486794a364d9856ce180 Mon Sep 17 00:00:00 2001
+From 3f509f32d4c3014486e98aa03405335d611bc8f0 Mon Sep 17 00:00:00 2001
 From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 Date: Mon, 23 Nov 2020 13:14:24 +0300
-Subject: [PATCH 11/12] Add workaround for os.path.isdir on Windows
+Subject: [PATCH 10/12] Add workaround for os.path.isdir on Windows
 
 Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 ---
  python/setup.py | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index 3c1d91e0e..356fc693d 100644
+index 7a225f72d..862e6ae94 100644
 --- a/python/setup.py
 +++ b/python/setup.py
 @@ -225,6 +225,24 @@ def download_pickle5(pickle5_dir):

diff --git a/....h-for-getpid-explicitly-on-Windows.patch → ....h-for-getpid-explicitly-on-Windows.patch b/....h-for-getpid-explicitly-on-Windows.patch → ....h-for-getpid-explicitly-on-Windows.patch
@@ -1,7 +1,7 @@
-From 578491167107ed920ffe4623b85230b9b452b144 Mon Sep 17 00:00:00 2001
+From 58db1bb52d2fa598d1be413ab0324a1c6cfa4960 Mon Sep 17 00:00:00 2001
 From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 Date: Tue, 24 Nov 2020 00:20:34 +0300
-Subject: [PATCH 12/12] Include <process.h> for getpid() explicitly on Windows
+Subject: [PATCH 11/12] Include <process.h> for getpid() explicitly on Windows
 
 Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
 ---

diff --git a/recipes/ray-packages/patches/0012-Empty-install-requirements-installed-by-conda-build.patch b/recipes/ray-packages/patches/0012-Empty-install-requirements-installed-by-conda-build.patch
@@ -0,0 +1,48 @@
+From e9687671ae3285b9c6ca811b1ddc80bcdb997076 Mon Sep 17 00:00:00 2001
+From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
+Date: Fri, 4 Dec 2020 12:49:34 +0300
+Subject: [PATCH 12/12] Empty install requirements - installed by conda build
+
+Signed-off-by: Vasily Litvinov <vasilij.n.litvinov@intel.com>
+---
+ python/setup.py | 24 +-----------------------
+ 1 file changed, 1 insertion(+), 23 deletions(-)
+
+diff --git a/python/setup.py b/python/setup.py
+index 862e6ae94..96b157b53 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -129,29 +129,7 @@ extras["all"] = list(set(chain.from_iterable(extras.values())))
+ # should be carefully curated. If you change it, please reflect
+ # the change in the matching section of requirements.txt
+ install_requires = [
+-    # TODO(alex) Pin the version once this PR is
+-    # included in the stable release.
+-    # https://github.com/aio-libs/aiohttp/pull/4556#issuecomment-679228562
+-    "aiohttp",
+-    "aiohttp_cors",
+-    "aioredis",
+-    "click >= 7.0",
+-    "colorama",
+-    "colorful",
+-    "filelock",
+-    "google",
+-    "gpustat",
+-    "grpcio >= 1.28.1",
+-    "jsonschema",
+-    "msgpack >= 1.0.0, < 2.0.0",
+-    "numpy >= 1.16",
+-    "protobuf >= 3.8.0",
+-    "py-spy >= 0.2.0",
+-    "pyyaml",
+-    "requests",
+-    "redis >= 3.3.2, < 3.5.0",
+-    "opencensus",
+-    "prometheus_client >= 0.7.1",
++    # everything should be installed via conda build recipe
+ ]
+
+
+-- 
+2.11.0
+