From c65c0000b8fcd19a70f51df783ec550e62b63d88 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 10:04:45 +0100 Subject: [PATCH 01/14] Ray 1.4.1 --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 02868778..40ea8b8e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.4.0" %} +{% set version = "1.4.1" %} package: name: ray-packages @@ -6,7 +6,7 @@ package: source: url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz - sha256: 1ad04845dad6824220ad7750d666e7186f6b9186fb99294aae7d0e35f8e75018 + sha256: 30b1f5a536d5f6ccddf757cafb2b8b128f74df6816ab0ec62a6dea13bdb629f7 patches: - patches/0001-Do-not-force-pickle5-in-sys.path.patch - patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch @@ -305,3 +305,4 @@ extra: - dHannasch - h-vetinari - vnlitvinov + - krfricke From f356865c403bed62604b91c416d380a86b1028f0 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 10:50:03 +0100 Subject: [PATCH 02/14] Fix sha --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 40ea8b8e..df524221 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,7 +6,7 @@ package: source: url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz - sha256: 30b1f5a536d5f6ccddf757cafb2b8b128f74df6816ab0ec62a6dea13bdb629f7 + sha256: a5fcaeb405fc9e6ddf084d55d202f72c919e974dac736d0426a8b569f7022e4a patches: - patches/0001-Do-not-force-pickle5-in-sys.path.patch - patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch From 59f28c8837050e76dfa9730000122f269ea8e412 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 11:40:30 +0100 Subject: [PATCH 03/14] Update patches --- recipe/meta.yaml | 5 ++-- ...001-Do-not-force-pickle5-in-sys.path.patch | 8 +++--- ...ild-for-non-default-compiler-drivers.patch | 6 ++-- ...Redis-deps-now-build-but-do-not-link.patch | 6 ++-- ...isable-making-non-core-entry-scripts.patch | 10 +++---- ...ot-and-output-dir-right-above-SRC_DI.patch | 10 +++---- ...crash-if-BAZEL_SH-not-set-on-Windows.patch | 10 +++---- ...-to-junctions-on-Windows-before-buil.patch | 12 ++++---- ...karound-for-os.path.isdir-on-Windows.patch | 12 ++++---- ...s.h-for-getpid-explicitly-on-Windows.patch | 6 ++-- ...equirements-installed-by-conda-build.patch | 24 ++++++++-------- ...-warnings-in-event.cc-and-logging.cc.patch | 28 +++++++++++++++++++ recipe/patches/0011-permit-python-3.9.patch | 25 ----------------- ...=> 0012-Disable-runfiles-on-windows.patch} | 10 +++---- 14 files changed, 87 insertions(+), 85 deletions(-) create mode 100644 recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch delete mode 100644 recipe/patches/0011-permit-python-3.9.patch rename recipe/patches/{0013-Disable-runfiles-on-windows.patch => 0012-Disable-runfiles-on-windows.patch} (84%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index df524221..421d5470 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,9 +18,8 @@ source: - patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch - patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch - patches/0010-Empty-install-requirements-installed-by-conda-build.patch - - patches/0011-permit-python-3.9.patch - - patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch - - patches/0013-Disable-runfiles-on-windows.patch + - patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch + - patches/0012-Disable-runfiles-on-windows.patch build: diff --git a/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch b/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch index abb63432..d8a2ed17 100644 --- a/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch +++ b/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch @@ -1,7 +1,7 @@ -From 578717348bb90cd268d339e94b9302d349012929 Mon Sep 17 00:00:00 2001 +From e1c5c21f5a9c254e98a8f10a467a181f9bec04bc Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Thu, 5 Nov 2020 12:04:25 +0300 -Subject: [PATCH 01/13] Do not force pickle5 in sys.path +Subject: [PATCH 01/12] Do not force pickle5 in sys.path Signed-off-by: Vasily Litvinov --- @@ -9,7 +9,7 @@ Signed-off-by: Vasily Litvinov 1 file changed, 6 deletions(-) diff --git a/python/ray/__init__.py b/python/ray/__init__.py -index 4f18b9411..45753e5a1 100644 +index 7c5eb9413..918000ce4 100644 --- a/python/ray/__init__.py +++ b/python/ray/__init__.py @@ -33,12 +33,6 @@ def _configure_system(): @@ -26,5 +26,5 @@ index 4f18b9411..45753e5a1 100644 # initialized. thirdparty_files = os.path.join( -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch b/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch index b51d5f9d..2b4768c4 100644 --- a/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch +++ b/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch @@ -1,7 +1,7 @@ -From 8936e498f38abd5d12bf0e970f7ddcf276f453f9 Mon Sep 17 00:00:00 2001 +From 2ad3ba43d6f33a9e18b86a5680e15c816b21f980 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Thu, 5 Nov 2020 17:05:44 +0300 -Subject: [PATCH 02/13] 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 --- @@ -29,5 +29,5 @@ index f428f7b36..9ec69d433 100644 # This library is for internal hiredis use, because hiredis assumes a -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch b/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch index b560f22f..0c8eec94 100644 --- a/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch +++ b/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch @@ -1,7 +1,7 @@ -From 311235bb948258691dbee9635e366fffc7f0ed3d Mon Sep 17 00:00:00 2001 +From 2fa1e41b13b0caacabda3cac51db475350321f3e Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Fri, 6 Nov 2020 00:55:05 +0300 -Subject: [PATCH 03/13] Redis deps now build but do not link +Subject: [PATCH 03/12] Redis deps now build but do not link Includes update for redis-6.0.9 @@ -142,5 +142,5 @@ index 000000000..36497c4b6 +2.11.0 + -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch b/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch index be8f5ac9..1b62ba2b 100644 --- a/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch +++ b/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch @@ -1,17 +1,17 @@ -From 8a1a5c64bd41172ebc4fac39cc93baac56137cac Mon Sep 17 00:00:00 2001 +From 4d5363d215b7373d207021032655282e41e9e143 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Tue, 10 Nov 2020 23:26:35 +0300 -Subject: [PATCH 04/13] Disable making non-core entry scripts +Subject: [PATCH 04/12] Disable making non-core entry scripts --- python/setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/setup.py b/python/setup.py -index 590020158..ea6925e25 100644 +index 577373e70..cb79b08ca 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -444,10 +444,10 @@ setuptools.setup( +@@ -457,10 +457,10 @@ setuptools.setup( entry_points={ "console_scripts": [ "ray=ray.scripts.scripts:main", @@ -27,5 +27,5 @@ index 590020158..ea6925e25 100644 }, include_package_data=True, -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch b/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch index 02b63b7a..9e09c869 100644 --- a/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch +++ b/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch @@ -1,7 +1,7 @@ -From 1bb7ed73f7b894e84e5e638a4a9f793b99f8c229 Mon Sep 17 00:00:00 2001 +From bfb149410ec41c4e1062a317d4f52374e5ace836 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 18 Nov 2020 18:47:40 +0300 -Subject: [PATCH 05/13] Contain bazel root and output dir right above $SRC_DIR +Subject: [PATCH 05/12] Contain bazel root and output dir right above $SRC_DIR Signed-off-by: Vasily Litvinov --- @@ -9,10 +9,10 @@ Signed-off-by: Vasily Litvinov 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py -index ea6925e25..e714d988d 100644 +index cb79b08ca..2cfe6f609 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -285,12 +285,18 @@ def build(build_python, build_java): +@@ -286,12 +286,18 @@ def build(build_python, build_java): logger.warning("Expected Bazel version {} but found {}".format( ".".join(map(str, SUPPORTED_BAZEL)), bazel_version_str)) @@ -33,5 +33,5 @@ index ea6925e25..e714d988d 100644 -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch b/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch index 5034e152..4bd6e9fd 100644 --- a/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch +++ b/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch @@ -1,7 +1,7 @@ -From d0ead439ac7e531f66e867eb19a06c90a6b48e91 Mon Sep 17 00:00:00 2001 +From aef7576624fcbe7f63fdf0703f448c90127e953c Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Fri, 20 Nov 2020 14:17:05 +0300 -Subject: [PATCH 06/13] Do not crash if BAZEL_SH not set on Windows +Subject: [PATCH 06/12] Do not crash if BAZEL_SH not set on Windows Signed-off-by: Vasilij Litvinov --- @@ -9,10 +9,10 @@ Signed-off-by: Vasilij Litvinov 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py -index e714d988d..ac937da29 100644 +index 2cfe6f609..248f1cf85 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -237,7 +237,7 @@ def build(build_python, build_java): +@@ -238,7 +238,7 @@ def build(build_python, build_java): SHELL = bazel_env.get("SHELL") if SHELL: bazel_env.setdefault("BAZEL_SH", os.path.normpath(SHELL)) @@ -22,5 +22,5 @@ index e714d988d..ac937da29 100644 wsl_bash = os.path.join(SYSTEMROOT, "System32", "bash.exe") if (not BAZEL_SH) and SYSTEMROOT and os.path.isfile(wsl_bash): -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch b/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch index ace9285d..9fb599d7 100644 --- a/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch +++ b/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch @@ -1,7 +1,7 @@ -From e4339570f80880bea34420af7d2310ad6ba44892 Mon Sep 17 00:00:00 2001 +From b9a0c4e81af7ca757bdcff2a057437b253261e41 Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Fri, 20 Nov 2020 15:32:19 +0300 -Subject: [PATCH 07/13] Convert symlinks to junctions on Windows before +Subject: [PATCH 07/12] Convert symlinks to junctions on Windows before building Signed-off-by: Vasilij Litvinov @@ -11,10 +11,10 @@ Signed-off-by: Gregory Shimansky 1 file changed, 43 insertions(+) diff --git a/python/setup.py b/python/setup.py -index ac937da29..020acc922 100644 +index 248f1cf85..b4f35220f 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -216,6 +216,48 @@ def download_pickle5(pickle5_dir): +@@ -217,6 +217,48 @@ def download_pickle5(pickle5_dir): finally: wzf.close() @@ -63,7 +63,7 @@ index ac937da29..020acc922 100644 def build(build_python, build_java): if tuple(sys.version_info[:2]) not in SUPPORTED_PYTHONS: -@@ -234,6 +276,7 @@ def build(build_python, build_java): +@@ -235,6 +277,7 @@ def build(build_python, build_java): bazel_env = dict(os.environ, PYTHON3_BIN_PATH=sys.executable) if is_native_windows_or_msys(): @@ -72,5 +72,5 @@ index ac937da29..020acc922 100644 if SHELL: bazel_env.setdefault("BAZEL_SH", os.path.normpath(SHELL)) -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch b/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch index 88b5a0df..6fd2131c 100644 --- a/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch +++ b/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch @@ -1,7 +1,7 @@ -From d4460b8fa513c5d3acf6c0ee65d1337cfa32a6be Mon Sep 17 00:00:00 2001 +From 4188a181abb5d2defff5c235dd20913cab5bd34c Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Mon, 23 Nov 2020 13:14:24 +0300 -Subject: [PATCH 08/13] Add workaround for os.path.isdir on Windows +Subject: [PATCH 08/12] Add workaround for os.path.isdir on Windows Signed-off-by: Vasilij Litvinov --- @@ -9,10 +9,10 @@ Signed-off-by: Vasilij Litvinov 1 file changed, 19 insertions(+) diff --git a/python/setup.py b/python/setup.py -index 020acc922..f29fd74df 100644 +index b4f35220f..a9a4fdf52 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -216,6 +216,24 @@ def download_pickle5(pickle5_dir): +@@ -217,6 +217,24 @@ def download_pickle5(pickle5_dir): finally: wzf.close() @@ -37,7 +37,7 @@ index 020acc922..f29fd74df 100644 def replace_symlinks_with_junctions(): _LINKS = { r'ray\new_dashboard': '../../dashboard', -@@ -257,6 +275,7 @@ def replace_symlinks_with_junctions(): +@@ -258,6 +276,7 @@ def replace_symlinks_with_junctions(): subprocess.check_call('MKLINK /J "{}" "{}"'.format(os.path.basename(link), target), shell=True, cwd=os.path.dirname(path)) if is_native_windows_or_msys(): @@ -46,5 +46,5 @@ index 020acc922..f29fd74df 100644 def build(build_python, build_java): -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch b/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch index 652fede5..557a0451 100644 --- a/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch +++ b/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch @@ -1,7 +1,7 @@ -From 2934ee1868a9337a258683e25b07f7a5c0c77299 Mon Sep 17 00:00:00 2001 +From 2dd9a6432ad87b78070546a5fe245c3032a71c5d Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Tue, 24 Nov 2020 00:20:34 +0300 -Subject: [PATCH 09/13] Include for getpid() explicitly on Windows +Subject: [PATCH 09/12] Include for getpid() explicitly on Windows Signed-off-by: Vasilij Litvinov --- @@ -24,5 +24,5 @@ index b872ae760..aee40f34e 100644 #if defined(_MSC_VER) #define UNREACHABLE __assume(0) -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch b/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch index 61eaf0a3..996a3827 100644 --- a/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch +++ b/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch @@ -1,14 +1,14 @@ -From 3c5886d8d47152735536fc7809908bbbad8041dd Mon Sep 17 00:00:00 2001 -From: Vasily Litvinov -Date: Fri, 4 Dec 2020 12:49:34 +0300 -Subject: [PATCH 10/13] Empty install requirements - installed by conda build +From 353efadf23e790e831f87021ae5d4517331e9a2d Mon Sep 17 00:00:00 2001 +From: Kai Fricke +Date: Fri, 6 Aug 2021 11:36:40 +0100 +Subject: [PATCH 10/12] Empty install requirements - installed by conda build --- python/setup.py | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/python/setup.py b/python/setup.py -index f29fd74df..3c42da44c 100644 +index a9a4fdf52..26d450a13 100644 --- a/python/setup.py +++ b/python/setup.py @@ -118,32 +118,7 @@ extras["all"] = list(set(chain.from_iterable(extras.values()))) @@ -30,7 +30,8 @@ index f29fd74df..3c42da44c 100644 - "grpcio >= 1.28.1", - "jsonschema", - "msgpack >= 1.0.0, < 2.0.0", -- "numpy >= 1.16", +- "numpy >= 1.16; python_version < '3.9'", +- "numpy >= 1.19.3; python_version >= '3.9'", - "protobuf >= 3.15.3", - "py-spy >= 0.2.0", - "pydantic >= 1.8", @@ -40,20 +41,19 @@ index f29fd74df..3c42da44c 100644 - "opencensus", - "prometheus_client >= 0.7.1", -] -- -+install_requires = [] # everything should be installed via conda build recipe ++install_requires = [] + def is_native_windows_or_msys(): - """Check to see if we are running on native Windows, -@@ -507,7 +482,7 @@ setuptools.setup( +@@ -520,7 +495,7 @@ setuptools.setup( # The BinaryDistribution argument triggers build_ext. distclass=BinaryDistribution, install_requires=install_requires, -- setup_requires=["cython >= 0.29.14", "wheel"], +- setup_requires=["cython >= 0.29.15", "wheel"], + setup_requires=[], extras_require=extras, entry_points={ "console_scripts": [ -- -2.30.2 +2.26.2 diff --git a/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch b/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch new file mode 100644 index 00000000..1d5a2c30 --- /dev/null +++ b/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch @@ -0,0 +1,28 @@ +From e117ba7562e864028c634d09ee10c4607b202cc7 Mon Sep 17 00:00:00 2001 +From: Vasily Litvinov +Date: Wed, 11 Nov 2020 01:08:16 +0300 +Subject: [PATCH 11/12] Ignore warnings in event.cc and logging.cc + +Signed-off-by: Vasily Litvinov +Signed-off-by: Gregory Shimansky +--- + .bazelrc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/.bazelrc b/.bazelrc +index cd0bd72c8..a785a2c55 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -37,6 +37,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror" + build:msvc --per_file_copt="-\\.(asm|S)$@-WX" + # Ignore warnings for protobuf generated files and external projects. + build --per_file_copt="\\.pb\\.cc$@-w" ++# Ignore one specific warning ++build --per_file_copt="event\\.cc$@-w" ++build --per_file_copt="logging\\.cc$@-w" + build --per_file_copt="-\\.(asm|S)$,external/.*@-w" + #build --per_file_copt="external/.*@-Wno-unused-result" + # Ignore minor warnings for host tools, which we generally can't control +-- +2.26.2 + diff --git a/recipe/patches/0011-permit-python-3.9.patch b/recipe/patches/0011-permit-python-3.9.patch deleted file mode 100644 index 4c52a8a8..00000000 --- a/recipe/patches/0011-permit-python-3.9.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 29a0ed13bf051aad79855999539b2f3924f4c386 Mon Sep 17 00:00:00 2001 -From: "H. Vetinari" -Date: Sat, 12 Dec 2020 14:28:05 +0100 -Subject: [PATCH 11/13] permit python 3.9 - ---- - python/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/setup.py b/python/setup.py -index 3c42da44c..c60731d9e 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__) - # before these files have been created, so we have to move the files - # manually. - --SUPPORTED_PYTHONS = [(3, 6), (3, 7), (3, 8)] -+SUPPORTED_PYTHONS = [(3, 6), (3, 7), (3, 8), (3, 9)] - SUPPORTED_BAZEL = (3, 2, 0) - - ROOT_DIR = os.path.dirname(__file__) --- -2.30.2 - diff --git a/recipe/patches/0013-Disable-runfiles-on-windows.patch b/recipe/patches/0012-Disable-runfiles-on-windows.patch similarity index 84% rename from recipe/patches/0013-Disable-runfiles-on-windows.patch rename to recipe/patches/0012-Disable-runfiles-on-windows.patch index df203763..e0153889 100644 --- a/recipe/patches/0013-Disable-runfiles-on-windows.patch +++ b/recipe/patches/0012-Disable-runfiles-on-windows.patch @@ -1,7 +1,7 @@ -From 4c532973a4ae2e62401db21530f8e49049ad1781 Mon Sep 17 00:00:00 2001 +From f219e59ca27d9ba5649a6f6f0e26a53d0d61410e Mon Sep 17 00:00:00 2001 From: Gregory Shimansky Date: Tue, 15 Jun 2021 17:17:34 -0500 -Subject: [PATCH 13/13] Disable runfiles on windows +Subject: [PATCH 12/12] Disable runfiles on windows because otherwise build-runfiles insists on creating symlinks that require elevated privileges during the build. @@ -12,10 +12,10 @@ Signed-off-by: Gregory Shimansky 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py -index c60731d9e..798d2cbd4 100644 +index 26d450a13..c7964b399 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -328,12 +328,15 @@ def build(build_python, build_java): +@@ -329,12 +329,15 @@ def build(build_python, build_java): if not os.path.exists(d): os.makedirs(d) @@ -33,5 +33,5 @@ index c60731d9e..798d2cbd4 100644 -- -2.30.2 +2.26.2 From 440a2ffcd2de5e87bf88268b617366fe4d013561 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 12:36:53 +0100 Subject: [PATCH 04/14] Add bazel linkopts/libs patch --- recipe/meta.yaml | 1 + .../0013-Add-bazel-linkopts-libs.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 recipe/patches/0013-Add-bazel-linkopts-libs.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 421d5470..60e2b4cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: - patches/0010-Empty-install-requirements-installed-by-conda-build.patch - patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch - patches/0012-Disable-runfiles-on-windows.patch + - patches/0013-Add-bazel-linkopts-libs.patch build: diff --git a/recipe/patches/0013-Add-bazel-linkopts-libs.patch b/recipe/patches/0013-Add-bazel-linkopts-libs.patch new file mode 100644 index 00000000..24db6c96 --- /dev/null +++ b/recipe/patches/0013-Add-bazel-linkopts-libs.patch @@ -0,0 +1,25 @@ +From 00917f6519deca3b8db735a92f0c7d5ee5a7d44e Mon Sep 17 00:00:00 2001 +From: Kai Fricke +Date: Fri, 6 Aug 2021 12:36:05 +0100 +Subject: [PATCH 13/13] Add bazel linkopts/libs + +--- + python/setup.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/python/setup.py b/python/setup.py +index c7964b399..5d6bc93e3 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -269,6 +269,8 @@ def build(build_python, build_java): + raise OSError(msg) + + bazel_env = dict(os.environ, PYTHON3_BIN_PATH=sys.executable) ++ bazel_env.setdefault("BAZEL_LINKOPTS", "-static-libstdc++:-lm") ++ bazel_env.setdefault("BAZEL_LINKLIBS", "-l%:libstdc++.a") + + if is_native_windows_or_msys(): + replace_symlinks_with_junctions() +-- +2.26.2 + From a50fbf4e92ddeed056e1d21e3968210008c5bdbf Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 13:02:22 +0100 Subject: [PATCH 05/14] Fix patch nubers --- recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch | 2 +- .../0002-Fix-redis-build-for-non-default-compiler-drivers.patch | 2 +- recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch | 2 +- recipe/patches/0004-Disable-making-non-core-entry-scripts.patch | 2 +- ...5-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch | 2 +- .../0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch | 2 +- ...7-Convert-symlinks-to-junctions-on-Windows-before-buil.patch | 2 +- .../0008-Add-workaround-for-os.path.isdir-on-Windows.patch | 2 +- ...009-Include-process.h-for-getpid-explicitly-on-Windows.patch | 2 +- ...10-Empty-install-requirements-installed-by-conda-build.patch | 2 +- .../0011-Ignore-warnings-in-event.cc-and-logging.cc.patch | 2 +- recipe/patches/0012-Disable-runfiles-on-windows.patch | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch b/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch index d8a2ed17..90019001 100644 --- a/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch +++ b/recipe/patches/0001-Do-not-force-pickle5-in-sys.path.patch @@ -1,7 +1,7 @@ From e1c5c21f5a9c254e98a8f10a467a181f9bec04bc Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Thu, 5 Nov 2020 12:04:25 +0300 -Subject: [PATCH 01/12] Do not force pickle5 in sys.path +Subject: [PATCH 01/13] Do not force pickle5 in sys.path Signed-off-by: Vasily Litvinov --- diff --git a/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch b/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch index 2b4768c4..04f55535 100644 --- a/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch +++ b/recipe/patches/0002-Fix-redis-build-for-non-default-compiler-drivers.patch @@ -1,7 +1,7 @@ From 2ad3ba43d6f33a9e18b86a5680e15c816b21f980 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Thu, 5 Nov 2020 17:05:44 +0300 -Subject: [PATCH 02/12] Fix redis build for non-default compiler drivers +Subject: [PATCH 02/13] Fix redis build for non-default compiler drivers Signed-off-by: Vasily Litvinov --- diff --git a/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch b/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch index 0c8eec94..eef6f076 100644 --- a/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch +++ b/recipe/patches/0003-Redis-deps-now-build-but-do-not-link.patch @@ -1,7 +1,7 @@ From 2fa1e41b13b0caacabda3cac51db475350321f3e Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Fri, 6 Nov 2020 00:55:05 +0300 -Subject: [PATCH 03/12] Redis deps now build but do not link +Subject: [PATCH 03/13] Redis deps now build but do not link Includes update for redis-6.0.9 diff --git a/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch b/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch index 1b62ba2b..9eb9ea5b 100644 --- a/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch +++ b/recipe/patches/0004-Disable-making-non-core-entry-scripts.patch @@ -1,7 +1,7 @@ From 4d5363d215b7373d207021032655282e41e9e143 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Tue, 10 Nov 2020 23:26:35 +0300 -Subject: [PATCH 04/12] Disable making non-core entry scripts +Subject: [PATCH 04/13] Disable making non-core entry scripts --- python/setup.py | 8 ++++---- diff --git a/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch b/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch index 9e09c869..9f75c859 100644 --- a/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch +++ b/recipe/patches/0005-Contain-bazel-root-and-output-dir-right-above-SRC_DI.patch @@ -1,7 +1,7 @@ From bfb149410ec41c4e1062a317d4f52374e5ace836 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 18 Nov 2020 18:47:40 +0300 -Subject: [PATCH 05/12] Contain bazel root and output dir right above $SRC_DIR +Subject: [PATCH 05/13] Contain bazel root and output dir right above $SRC_DIR Signed-off-by: Vasily Litvinov --- diff --git a/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch b/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch index 4bd6e9fd..fa34e8b9 100644 --- a/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch +++ b/recipe/patches/0006-Do-not-crash-if-BAZEL_SH-not-set-on-Windows.patch @@ -1,7 +1,7 @@ From aef7576624fcbe7f63fdf0703f448c90127e953c Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Fri, 20 Nov 2020 14:17:05 +0300 -Subject: [PATCH 06/12] Do not crash if BAZEL_SH not set on Windows +Subject: [PATCH 06/13] Do not crash if BAZEL_SH not set on Windows Signed-off-by: Vasilij Litvinov --- diff --git a/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch b/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch index 9fb599d7..6e2b911f 100644 --- a/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch +++ b/recipe/patches/0007-Convert-symlinks-to-junctions-on-Windows-before-buil.patch @@ -1,7 +1,7 @@ From b9a0c4e81af7ca757bdcff2a057437b253261e41 Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Fri, 20 Nov 2020 15:32:19 +0300 -Subject: [PATCH 07/12] Convert symlinks to junctions on Windows before +Subject: [PATCH 07/13] Convert symlinks to junctions on Windows before building Signed-off-by: Vasilij Litvinov diff --git a/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch b/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch index 6fd2131c..da67ec2c 100644 --- a/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch +++ b/recipe/patches/0008-Add-workaround-for-os.path.isdir-on-Windows.patch @@ -1,7 +1,7 @@ From 4188a181abb5d2defff5c235dd20913cab5bd34c Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Mon, 23 Nov 2020 13:14:24 +0300 -Subject: [PATCH 08/12] Add workaround for os.path.isdir on Windows +Subject: [PATCH 08/13] Add workaround for os.path.isdir on Windows Signed-off-by: Vasilij Litvinov --- diff --git a/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch b/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch index 557a0451..38f72e25 100644 --- a/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch +++ b/recipe/patches/0009-Include-process.h-for-getpid-explicitly-on-Windows.patch @@ -1,7 +1,7 @@ From 2dd9a6432ad87b78070546a5fe245c3032a71c5d Mon Sep 17 00:00:00 2001 From: Vasilij Litvinov Date: Tue, 24 Nov 2020 00:20:34 +0300 -Subject: [PATCH 09/12] Include for getpid() explicitly on Windows +Subject: [PATCH 09/13] Include for getpid() explicitly on Windows Signed-off-by: Vasilij Litvinov --- diff --git a/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch b/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch index 996a3827..ad64ce09 100644 --- a/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch +++ b/recipe/patches/0010-Empty-install-requirements-installed-by-conda-build.patch @@ -1,7 +1,7 @@ From 353efadf23e790e831f87021ae5d4517331e9a2d Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 11:36:40 +0100 -Subject: [PATCH 10/12] Empty install requirements - installed by conda build +Subject: [PATCH 10/13] Empty install requirements - installed by conda build --- python/setup.py | 29 ++--------------------------- diff --git a/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch b/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch index 1d5a2c30..5c9db525 100644 --- a/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch +++ b/recipe/patches/0011-Ignore-warnings-in-event.cc-and-logging.cc.patch @@ -1,7 +1,7 @@ From e117ba7562e864028c634d09ee10c4607b202cc7 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 11 Nov 2020 01:08:16 +0300 -Subject: [PATCH 11/12] Ignore warnings in event.cc and logging.cc +Subject: [PATCH 11/13] Ignore warnings in event.cc and logging.cc Signed-off-by: Vasily Litvinov Signed-off-by: Gregory Shimansky diff --git a/recipe/patches/0012-Disable-runfiles-on-windows.patch b/recipe/patches/0012-Disable-runfiles-on-windows.patch index e0153889..fbb895d6 100644 --- a/recipe/patches/0012-Disable-runfiles-on-windows.patch +++ b/recipe/patches/0012-Disable-runfiles-on-windows.patch @@ -1,7 +1,7 @@ From f219e59ca27d9ba5649a6f6f0e26a53d0d61410e Mon Sep 17 00:00:00 2001 From: Gregory Shimansky Date: Tue, 15 Jun 2021 17:17:34 -0500 -Subject: [PATCH 12/12] Disable runfiles on windows +Subject: [PATCH 12/13] Disable runfiles on windows because otherwise build-runfiles insists on creating symlinks that require elevated privileges during the build. From ed2ea0277a401b905ff60be72c756ffed222044f Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 6 Aug 2021 12:13:11 +0000 Subject: [PATCH 06/14] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.05.18.49.42 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_python3.6.____cpython.yaml | 4 ++++ .ci_support/linux_64_python3.7.____cpython.yaml | 4 ++++ .ci_support/linux_64_python3.8.____cpython.yaml | 4 ++++ .ci_support/linux_64_python3.9.____cpython.yaml | 4 ++++ .ci_support/win_64_python3.6.____cpython.yaml | 4 ++++ .ci_support/win_64_python3.7.____cpython.yaml | 4 ++++ .ci_support/win_64_python3.8.____cpython.yaml | 4 ++++ .ci_support/win_64_python3.9.____cpython.yaml | 4 ++++ .github/CODEOWNERS | 2 +- README.md | 1 + 11 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 5c854f79..83378fb5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -95,7 +95,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml index 0f10ae90..99094cff 100644 --- a/.ci_support/linux_64_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_python3.6.____cpython.yaml @@ -16,6 +16,10 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml index 321b7173..7c8791b0 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpython.yaml @@ -16,6 +16,10 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index f0ea26ae..98dab4a1 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -16,6 +16,10 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 4515e4d3..1a63333f 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -16,6 +16,10 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/win_64_python3.6.____cpython.yaml b/.ci_support/win_64_python3.6.____cpython.yaml index 638246ac..e7398c4e 100644 --- a/.ci_support/win_64_python3.6.____cpython.yaml +++ b/.ci_support/win_64_python3.6.____cpython.yaml @@ -8,6 +8,10 @@ curl: - '7' cxx_compiler: - vs2017 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpython.yaml index c58a840c..de62ba51 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/win_64_python3.7.____cpython.yaml @@ -8,6 +8,10 @@ curl: - '7' cxx_compiler: - vs2017 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index e962b358..4ec0e802 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -8,6 +8,10 @@ curl: - '7' cxx_compiler: - vs2017 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index ee876cd0..1b67990e 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -8,6 +8,10 @@ curl: - '7' cxx_compiler: - vs2017 +nodejs: +- '12' +- '14' +- '15' pin_run_as_build: curl: max_pin: x diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 48de2b59..4c84bac2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @dHannasch @h-vetinari @vnlitvinov \ No newline at end of file +* @dHannasch @h-vetinari @krfricke @vnlitvinov \ No newline at end of file diff --git a/README.md b/README.md index 2bc0c383..d74769e1 100644 --- a/README.md +++ b/README.md @@ -201,5 +201,6 @@ Feedstock Maintainers * [@dHannasch](https://github.com/dHannasch/) * [@h-vetinari](https://github.com/h-vetinari/) +* [@krfricke](https://github.com/krfricke/) * [@vnlitvinov](https://github.com/vnlitvinov/) From fbb74dc4d7a57010680475520e384f44558747ef Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 13:39:07 +0100 Subject: [PATCH 07/14] Update meta file --- recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 60e2b4cd..721ce187 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - bazel <=3.7.2 - - cython >=0.29 + - cython >=0.29.15 - curl - make - m2-patch # [win] @@ -72,7 +72,7 @@ outputs: - bazel <=3.4.1 # [not win] - bazel <3.7 # [win] - curl - - cython >=0.29 + - cython >=0.29.15 - make host: - python @@ -97,7 +97,8 @@ outputs: - grpcio >=1.28.1 - jsonschema - msgpack-python >=1.0.0, <2.0.0 - - numpy >=1.16 + - numpy >=1.16 # [py<39] + - numpy >=1.19.3 # [py>=39] - opencensus - pickle5 # [py<38] - prometheus_client >=0.7.1 From 7ca68ba6a5e895256f55a75ef31f4379e3da4329 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 13:55:38 +0100 Subject: [PATCH 08/14] Revert "Update meta file" This reverts commit fbb74dc4d7a57010680475520e384f44558747ef. --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 721ce187..60e2b4cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - bazel <=3.7.2 - - cython >=0.29.15 + - cython >=0.29 - curl - make - m2-patch # [win] @@ -72,7 +72,7 @@ outputs: - bazel <=3.4.1 # [not win] - bazel <3.7 # [win] - curl - - cython >=0.29.15 + - cython >=0.29 - make host: - python @@ -97,8 +97,7 @@ outputs: - grpcio >=1.28.1 - jsonschema - msgpack-python >=1.0.0, <2.0.0 - - numpy >=1.16 # [py<39] - - numpy >=1.19.3 # [py>=39] + - numpy >=1.16 - opencensus - pickle5 # [py<38] - prometheus_client >=0.7.1 From 0ad6110fde14ff3dabef49d3f27cb01c317df1c2 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 14:56:19 +0100 Subject: [PATCH 09/14] sysroot_linux --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 60e2b4cd..1dcb93e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -71,6 +71,7 @@ outputs: - {{ compiler('cxx') }} - bazel <=3.4.1 # [not win] - bazel <3.7 # [win] + - sysroot_linux-64 2.17 # [linux64] - curl - cython >=0.29 - make From b4111efc8d1ae78ad58bdbac070781da755a8ca3 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 15:05:21 +0100 Subject: [PATCH 10/14] onda build config / cos7 --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..5052c990 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +cdt_name: # [linux] + - cos7 # [linux] From c4d81d8060d359fa266192f111529c400c6def56 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 14:56:19 +0100 Subject: [PATCH 11/14] sysroot_linux --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 60e2b4cd..1dcb93e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -71,6 +71,7 @@ outputs: - {{ compiler('cxx') }} - bazel <=3.4.1 # [not win] - bazel <3.7 # [win] + - sysroot_linux-64 2.17 # [linux64] - curl - cython >=0.29 - make From ce86c2bf2c7bb2f520a25c9f1409ec98e6a0bfbc Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Fri, 6 Aug 2021 15:05:21 +0100 Subject: [PATCH 12/14] conda build config / cos7 Co-Authored-By: H. Vetinari --- recipe/conda_build_config.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..77c2e511 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,8 @@ +cuda_compiler_version: # [linux64] + - None # [linux64] +docker_image: # [linux64] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64] +cudnn: # [linux64] + - undefined # [linux64] +cdt_name: # [linux64] + - cos7 # [linux64] From 28a2855768e55a575bdd32cbbb728b13c9c2d313 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 6 Aug 2021 17:30:56 +0200 Subject: [PATCH 13/14] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.05.18.49.42 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++---- .ci_support/linux_64_python3.6.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.7.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.8.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.9.____cpython.yaml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d432bd41..817ddf54 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,19 +11,19 @@ jobs: linux_64_python3.6.____cpython: CONFIG: linux_64_python3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.7.____cpython: CONFIG: linux_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpython: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____cpython: CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml index 99094cff..6f28b0e9 100644 --- a/.ci_support/linux_64_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_python3.6.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '9' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 nodejs: - '12' - '14' diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml index 7c8791b0..91e63249 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '9' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 nodejs: - '12' - '14' diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 98dab4a1..33b0a20b 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '9' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 nodejs: - '12' - '14' diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 1a63333f..b1380238 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '9' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 nodejs: - '12' - '14' From 9b99dcdca46af68b90829b21ce9815992cdcd251 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Mon, 9 Aug 2021 12:37:46 +0100 Subject: [PATCH 14/14] Delete obsolete patch --- ...-warnings-in-event.cc-and-logging.cc.patch | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 recipe/patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch diff --git a/recipe/patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch b/recipe/patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch deleted file mode 100644 index 34990184..00000000 --- a/recipe/patches/0012-Ignore-warnings-in-event.cc-and-logging.cc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7d9e25071bfabd41f5e4c086b478701f2b511f57 Mon Sep 17 00:00:00 2001 -From: Vasily Litvinov -Date: Wed, 11 Nov 2020 01:08:16 +0300 -Subject: [PATCH 12/13] Ignore warnings in event.cc and logging.cc - -Signed-off-by: Vasily Litvinov -Signed-off-by: Gregory Shimansky ---- - .bazelrc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/.bazelrc b/.bazelrc -index cd0bd72c8..a785a2c55 100644 ---- a/.bazelrc -+++ b/.bazelrc -@@ -37,6 +37,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror" - build:msvc --per_file_copt="-\\.(asm|S)$@-WX" - # Ignore warnings for protobuf generated files and external projects. - build --per_file_copt="\\.pb\\.cc$@-w" -+# Ignore one specific warning -+build --per_file_copt="event\\.cc$@-w" -+build --per_file_copt="logging\\.cc$@-w" - build --per_file_copt="-\\.(asm|S)$,external/.*@-w" - #build --per_file_copt="external/.*@-Wno-unused-result" - # Ignore minor warnings for host tools, which we generally can't control --- -2.30.2 -