From 1e1c377c9682bba03606cde7fa1b06a55fd41af8 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Fri, 4 Dec 2020 12:51:04 +0300 Subject: [PATCH] Change the way setup.py reqs are satisfied Signed-off-by: Vasily Litvinov --- recipes/ray-packages/meta.yaml | 28 +++++------ ...01-Do-not-force-pickle5-in-sys.path.patch} | 4 +- ...-install-requirements-installed-by-c.patch | 27 ----------- ...ld-for-non-default-compiler-drivers.patch} | 4 +- ...ix-plasma-linking-for-ancient-glibc.patch} | 4 +- ...edis-deps-now-build-but-do-not-link.patch} | 4 +- ...sable-making-non-core-entry-scripts.patch} | 8 ++-- ...> 0006-Ignore-warnings-for-one-file.patch} | 4 +- ...t-and-output-dir-right-above-SRC_DI.patch} | 6 +-- ...rash-if-BAZEL_SH-not-set-on-Windows.patch} | 6 +-- ...to-junctions-on-Windows-before-buil.patch} | 6 +-- ...around-for-os.path.isdir-on-Windows.patch} | 6 +-- ....h-for-getpid-explicitly-on-Windows.patch} | 4 +- ...equirements-installed-by-conda-build.patch | 48 +++++++++++++++++++ 14 files changed, 90 insertions(+), 69 deletions(-) rename recipes/ray-packages/patches/{0002-Do-not-force-pickle5-in-sys.path.patch => 0001-Do-not-force-pickle5-in-sys.path.patch} (89%) delete mode 100644 recipes/ray-packages/patches/0001-Remove-setup-and-install-requirements-installed-by-c.patch rename recipes/ray-packages/patches/{0003-Fix-redis-build-for-non-default-compiler-drivers.patch => 0002-Fix-redis-build-for-non-default-compiler-drivers.patch} (86%) rename recipes/ray-packages/patches/{0004-Fix-plasma-linking-for-ancient-glibc.patch => 0003-Fix-plasma-linking-for-ancient-glibc.patch} (85%) rename recipes/ray-packages/patches/{0005-Redis-deps-now-build-but-do-not-link.patch => 0004-Redis-deps-now-build-but-do-not-link.patch} (97%) rename recipes/ray-packages/patches/{0006-Disable-making-non-core-entry-scripts.patch => 0005-Disable-making-non-core-entry-scripts.patch} (76%) rename recipes/ray-packages/patches/{0007-Ignore-warnings-for-one-file.patch => 0006-Ignore-warnings-for-one-file.patch} (87%) rename recipes/ray-packages/patches/{0008-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch => 0007-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch} (88%) rename recipes/ray-packages/patches/{0009-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch => 0008-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch} (83%) rename recipes/ray-packages/patches/{0010-Convert-symlinks-to-junctions-on-Windows-before-buil.patch => 0009-Convert-symlinks-to-junctions-on-Windows-before-buil.patch} (94%) rename recipes/ray-packages/patches/{0011-Add-workaround-for-os.path.isdir-on-Windows.patch => 0010-Add-workaround-for-os.path.isdir-on-Windows.patch} (92%) rename recipes/ray-packages/patches/{0012-Include-process.h-for-getpid-explicitly-on-Windows.patch => 0011-Include-process.h-for-getpid-explicitly-on-Windows.patch} (83%) create mode 100644 recipes/ray-packages/patches/0012-Empty-install-requirements-installed-by-conda-build.patch diff --git a/recipes/ray-packages/meta.yaml b/recipes/ray-packages/meta.yaml index b70e0ddea61e6..5fd4d2ee265da 100644 --- 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/recipes/ray-packages/patches/0002-Do-not-force-pickle5-in-sys.path.patch b/recipes/ray-packages/patches/0001-Do-not-force-pickle5-in-sys.path.patch similarity index 89% rename from recipes/ray-packages/patches/0002-Do-not-force-pickle5-in-sys.path.patch rename to recipes/ray-packages/patches/0001-Do-not-force-pickle5-in-sys.path.patch index 02009cca8b25f..ad6467de727d4 100644 --- a/recipes/ray-packages/patches/0002-Do-not-force-pickle5-in-sys.path.patch +++ b/recipes/ray-packages/patches/0001-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 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 --- 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 deleted file mode 100644 index e9f61a2bb0248..0000000000000 --- a/recipes/ray-packages/patches/0001-Remove-setup-and-install-requirements-installed-by-c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From affe378babc22f982b9c74e401719860ca8faa74 Mon Sep 17 00:00:00 2001 -From: Vasily Litvinov -Date: Thu, 5 Nov 2020 11:59:26 +0300 -Subject: [PATCH 01/12] Remove setup and install requirements - installed by - conda recipe - -Signed-off-by: Vasily Litvinov ---- - python/setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/python/setup.py b/python/setup.py -index d64d8402e..d6b034594 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -456,8 +456,6 @@ setuptools.setup( - cmdclass={"build_ext": build_ext}, - # The BinaryDistribution argument triggers build_ext. - distclass=BinaryDistribution, -- install_requires=install_requires, -- setup_requires=["cython >= 0.29.14", "wheel"], - extras_require=extras, - entry_points={ - "console_scripts": [ --- -2.11.0 - diff --git a/recipes/ray-packages/patches/0003-Fix-redis-build-for-non-default-compiler-drivers.patch b/recipes/ray-packages/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch similarity index 86% rename from recipes/ray-packages/patches/0003-Fix-redis-build-for-non-default-compiler-drivers.patch rename to recipes/ray-packages/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch index 7e1e59521cd51..52ae3c2d0d01a 100644 --- a/recipes/ray-packages/patches/0003-Fix-redis-build-for-non-default-compiler-drivers.patch +++ b/recipes/ray-packages/patches/0002-Fix-redis-build-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 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 --- diff --git a/recipes/ray-packages/patches/0004-Fix-plasma-linking-for-ancient-glibc.patch b/recipes/ray-packages/patches/0003-Fix-plasma-linking-for-ancient-glibc.patch similarity index 85% rename from recipes/ray-packages/patches/0004-Fix-plasma-linking-for-ancient-glibc.patch rename to recipes/ray-packages/patches/0003-Fix-plasma-linking-for-ancient-glibc.patch index 069ec24d1392f..473c474f062f7 100644 --- a/recipes/ray-packages/patches/0004-Fix-plasma-linking-for-ancient-glibc.patch +++ b/recipes/ray-packages/patches/0003-Fix-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 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 --- diff --git a/recipes/ray-packages/patches/0005-Redis-deps-now-build-but-do-not-link.patch b/recipes/ray-packages/patches/0004-Redis-deps-now-build-but-do-not-link.patch similarity index 97% rename from recipes/ray-packages/patches/0005-Redis-deps-now-build-but-do-not-link.patch rename to recipes/ray-packages/patches/0004-Redis-deps-now-build-but-do-not-link.patch index e265b5ec730c5..b9e0aadecc936 100644 --- a/recipes/ray-packages/patches/0005-Redis-deps-now-build-but-do-not-link.patch +++ b/recipes/ray-packages/patches/0004-Redis-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 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 --- diff --git a/recipes/ray-packages/patches/0006-Disable-making-non-core-entry-scripts.patch b/recipes/ray-packages/patches/0005-Disable-making-non-core-entry-scripts.patch similarity index 76% rename from recipes/ray-packages/patches/0006-Disable-making-non-core-entry-scripts.patch rename to recipes/ray-packages/patches/0005-Disable-making-non-core-entry-scripts.patch index 1ebf56c5a6d64..11a3fc3990822 100644 --- a/recipes/ray-packages/patches/0006-Disable-making-non-core-entry-scripts.patch +++ b/recipes/ray-packages/patches/0005-Disable-making-non-core-entry-scripts.patch @@ -1,7 +1,7 @@ -From cc3e907f8b3be28532296a33aade6f59b2044b85 Mon Sep 17 00:00:00 2001 +From c47b6651ef95e0aed30aebfb5762568b0404c66c Mon Sep 17 00:00:00 2001 From: Vasily Litvinov 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 --- @@ -9,10 +9,10 @@ Signed-off-by: Vasily Litvinov 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/recipes/ray-packages/patches/0007-Ignore-warnings-for-one-file.patch b/recipes/ray-packages/patches/0006-Ignore-warnings-for-one-file.patch similarity index 87% rename from recipes/ray-packages/patches/0007-Ignore-warnings-for-one-file.patch rename to recipes/ray-packages/patches/0006-Ignore-warnings-for-one-file.patch index 41d02bb9a8d87..ef4754285254a 100644 --- a/recipes/ray-packages/patches/0007-Ignore-warnings-for-one-file.patch +++ b/recipes/ray-packages/patches/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 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 --- diff --git a/recipes/ray-packages/patches/0008-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch b/recipes/ray-packages/patches/0007-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch similarity index 88% rename from recipes/ray-packages/patches/0008-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch rename to recipes/ray-packages/patches/0007-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch index edb340890a3e2..c80767b47ca72 100644 --- a/recipes/ray-packages/patches/0008-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch +++ b/recipes/ray-packages/patches/0007-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch @@ -1,7 +1,7 @@ -From 7dcb04b40c4fced25ca223186e2f031755e63b1d Mon Sep 17 00:00:00 2001 +From 30440e5c666e4d85851acaf9f097af234cbb1d7c Mon Sep 17 00:00:00 2001 From: Vasily Litvinov 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 --- @@ -9,7 +9,7 @@ Signed-off-by: Vasily Litvinov 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/recipes/ray-packages/patches/0009-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch b/recipes/ray-packages/patches/0008-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch similarity index 83% rename from recipes/ray-packages/patches/0009-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch rename to recipes/ray-packages/patches/0008-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch index 12079d0001a2a..d7c32dfa071d4 100644 --- a/recipes/ray-packages/patches/0009-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch +++ b/recipes/ray-packages/patches/0008-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch @@ -1,7 +1,7 @@ -From 840581a6aaf81b5fa1cd4c485655d34356bd2951 Mon Sep 17 00:00:00 2001 +From 8e5a3c9b85993f5ec00c8ca350ec932ade63d34a Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov 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 --- @@ -9,7 +9,7 @@ Signed-off-by: Vasilij Litvinov 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/recipes/ray-packages/patches/0010-Convert-symlinks-to-junctions-on-Windows-before-buil.patch b/recipes/ray-packages/patches/0009-Convert-symlinks-to-junctions-on-Windows-before-buil.patch similarity index 94% rename from recipes/ray-packages/patches/0010-Convert-symlinks-to-junctions-on-Windows-before-buil.patch rename to recipes/ray-packages/patches/0009-Convert-symlinks-to-junctions-on-Windows-before-buil.patch index ad44d11fbf14e..b68edb60815de 100644 --- a/recipes/ray-packages/patches/0010-Convert-symlinks-to-junctions-on-Windows-before-buil.patch +++ b/recipes/ray-packages/patches/0009-Convert-symlinks-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 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 @@ -10,7 +10,7 @@ Signed-off-by: Vasilij Litvinov 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/recipes/ray-packages/patches/0011-Add-workaround-for-os.path.isdir-on-Windows.patch b/recipes/ray-packages/patches/0010-Add-workaround-for-os.path.isdir-on-Windows.patch similarity index 92% rename from recipes/ray-packages/patches/0011-Add-workaround-for-os.path.isdir-on-Windows.patch rename to recipes/ray-packages/patches/0010-Add-workaround-for-os.path.isdir-on-Windows.patch index c0269a2e7b22c..09770a9780239 100644 --- a/recipes/ray-packages/patches/0011-Add-workaround-for-os.path.isdir-on-Windows.patch +++ b/recipes/ray-packages/patches/0010-Add-workaround-for-os.path.isdir-on-Windows.patch @@ -1,7 +1,7 @@ -From c4332f87c668c7d88a03486794a364d9856ce180 Mon Sep 17 00:00:00 2001 +From 3f509f32d4c3014486e98aa03405335d611bc8f0 Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov 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 --- @@ -9,7 +9,7 @@ Signed-off-by: Vasilij Litvinov 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/recipes/ray-packages/patches/0012-Include-process.h-for-getpid-explicitly-on-Windows.patch b/recipes/ray-packages/patches/0011-Include-process.h-for-getpid-explicitly-on-Windows.patch similarity index 83% rename from recipes/ray-packages/patches/0012-Include-process.h-for-getpid-explicitly-on-Windows.patch rename to recipes/ray-packages/patches/0011-Include-process.h-for-getpid-explicitly-on-Windows.patch index ac920793ac97e..6efb37dc941b6 100644 --- a/recipes/ray-packages/patches/0012-Include-process.h-for-getpid-explicitly-on-Windows.patch +++ b/recipes/ray-packages/patches/0011-Include-process.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 Date: Tue, 24 Nov 2020 00:20:34 +0300 -Subject: [PATCH 12/12] Include for getpid() explicitly on Windows +Subject: [PATCH 11/12] Include for getpid() explicitly on Windows Signed-off-by: Vasilij Litvinov --- 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 new file mode 100644 index 0000000000000..16e2aac1c7462 --- /dev/null +++ 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 +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 +--- + 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 +