From c22c335e597236d2758859b441cd51c278169001 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:47:02 +1100 Subject: [PATCH 1/6] python 3.10.14 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61003f47..f7132b0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set version = "3.10.13" %} +{% set version = "3.10.14" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 1 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -47,7 +47,7 @@ source: {% else %} - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/ - md5: 8847dc6458d1431d0ae0f55942deeb89 + md5: 05148354ce821ba7369e5b7958435400 {% endif %} patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch From 07e71f453dcbe7ba6d5007947a55aee4ebaf7e82 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:47:31 +1100 Subject: [PATCH 2/6] rebase patches --- .../0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch | 2 +- ...Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch | 2 +- recipe/patches/0003-Support-cross-compiling-byte-code.patch | 4 ++-- ...bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch | 2 +- ...runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch | 2 +- recipe/patches/0006-Win32-Do-not-download-externals.patch | 2 +- ...Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch | 2 +- ...bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch | 2 +- ...Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 2 +- recipe/patches/0010-Unvendor-openssl.patch | 4 ++-- recipe/patches/0011-Unvendor-sqlite3.patch | 4 ++-- .../0012-Use-ranlib-from-env-if-env-variable-is-set.patch | 2 +- .../patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch | 2 +- ...Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch | 2 +- recipe/patches/0015-Doing-d1trimfile.patch | 2 +- recipe/patches/0016-cross-compile-darwin.patch | 2 +- recipe/patches/0017-Fix-TZPATH-on-windows.patch | 2 +- ...8-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch | 2 +- .../0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch | 2 +- recipe/patches/0020-Unvendor-bzip2.patch | 2 +- recipe/patches/0021-Unvendor-libffi.patch | 2 +- recipe/patches/0022-Unvendor-tcltk.patch | 2 +- recipe/patches/0023-unvendor-xz.patch | 2 +- recipe/patches/0024-unvendor-zlib.patch | 2 +- .../patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 6801c159..19d7158c 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,4 +1,4 @@ -From 88d0d2ea132c2880cfb4557fdbddf99237ea844e Mon Sep 17 00:00:00 2001 +From 10f35347798231c4e0b56315eaaa2af0c0f49f4c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048 diff --git a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch index 697d7acd..9cddef7f 100644 --- a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch +++ b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch @@ -1,4 +1,4 @@ -From 43d47d05177843f65a8362f8f519b442bd52498c Mon Sep 17 00:00:00 2001 +From 0329fff43db65c2ace0ed0492ae295dc9a49178d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:59:00 +0100 Subject: [PATCH 02/25] Win32: distutils: Add support to cygwinccompiler for diff --git a/recipe/patches/0003-Support-cross-compiling-byte-code.patch b/recipe/patches/0003-Support-cross-compiling-byte-code.patch index 1726fe75..28ea9982 100644 --- a/recipe/patches/0003-Support-cross-compiling-byte-code.patch +++ b/recipe/patches/0003-Support-cross-compiling-byte-code.patch @@ -1,4 +1,4 @@ -From 3beb28c3bacf530b78d892c139e30bf952dbb845 Mon Sep 17 00:00:00 2001 +From 7f2937f590d274969c748782dbb47c4ad1e4a3f6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:17:33 +0100 Subject: [PATCH 03/25] Support cross-compiling byte-code @@ -11,7 +11,7 @@ https://bugs.python.org/issue22724 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 51c31b94ae..c9cbacfa32 100644 +index fa99dd86c4..eada53ed36 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -261,6 +261,7 @@ BUILDPYTHON= python$(BUILDEXE) diff --git a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch index a6d940dc..0858ab38 100644 --- a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch +++ b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch @@ -1,4 +1,4 @@ -From c780a04ae39842ee41d733b429dba378721a6901 Mon Sep 17 00:00:00 2001 +From 36fbaeb7f7a6673066c468426efa5d5a8bc71aa5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 21 Sep 2021 13:05:20 -0500 Subject: [PATCH 04/25] bpo-45258: search for -isysroot in addition to diff --git a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch index 64a3fc05..da42716f 100644 --- a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch +++ b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch @@ -1,4 +1,4 @@ -From e7360da6eed2e5687dfc7f04f8689ed2bf2cb25a Mon Sep 17 00:00:00 2001 +From e8431940cfef761b7c6b31c0f927df342263cef8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 5 Oct 2017 02:00:41 +0100 Subject: [PATCH 05/25] runtime_library_dir_option: Use 1st word of CC as diff --git a/recipe/patches/0006-Win32-Do-not-download-externals.patch b/recipe/patches/0006-Win32-Do-not-download-externals.patch index 1d720444..5dcdbd30 100644 --- a/recipe/patches/0006-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0006-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From df5feaf0eab75748a09d82d553351596b069250a Mon Sep 17 00:00:00 2001 +From f2bcc66170d982e671dfd28ad88caf923b68c3f2 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 06/25] Win32: Do not download externals diff --git a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 8d36df1a..113e0f26 100644 --- a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,4 +1,4 @@ -From fae7328a750c4d885f2a0569e4f1949000653c53 Mon Sep 17 00:00:00 2001 +From 45a4096e28d45ad74b9866c1d96a81282e721ecb Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 07/25] Fix find_library so that it looks in sys.prefix/lib diff --git a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch index 897e427d..f6b32722 100644 --- a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch +++ b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch @@ -1,4 +1,4 @@ -From 103123be4673a577623fb03cda944df66ea22623 Mon Sep 17 00:00:00 2001 +From 49726f1962c2ad78932ac40621e35d1428f46d37 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 16 Sep 2021 15:46:09 -0500 Subject: [PATCH 08/25] bpo-22699: Allow compiling on debian/ubuntu with a diff --git a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index e77ce037..4b0fa1e5 100644 --- a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,4 +1,4 @@ -From f874c6dca963c0a35299cbfcaa614d6dfec1a3a6 Mon Sep 17 00:00:00 2001 +From c4a41cf22604fb8bb66f195aa7780d843418344a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 09/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS diff --git a/recipe/patches/0010-Unvendor-openssl.patch b/recipe/patches/0010-Unvendor-openssl.patch index 7e69b456..d970bbe5 100644 --- a/recipe/patches/0010-Unvendor-openssl.patch +++ b/recipe/patches/0010-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 3680f81b95a172528bbf37c8a4d6efc6fbb0df36 Mon Sep 17 00:00:00 2001 +From 91e037ed322b7ce83ad7fd60fef6bbe0d76587c0 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 10/25] Unvendor openssl @@ -141,7 +141,7 @@ index 0da6f67495..17eee400eb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 33d5f8fb7a..74ba0a9419 100644 +index 057ed5ac22..b7f958193c 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -57,6 +57,7 @@ diff --git a/recipe/patches/0011-Unvendor-sqlite3.patch b/recipe/patches/0011-Unvendor-sqlite3.patch index 610f8c96..9beffc9f 100644 --- a/recipe/patches/0011-Unvendor-sqlite3.patch +++ b/recipe/patches/0011-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 696a8dd996860d85f323f3d949836825e1fb7a85 Mon Sep 17 00:00:00 2001 +From 11130223b608ff02ed637041e46a8d1a05faf21d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 11/25] Unvendor sqlite3 @@ -52,7 +52,7 @@ index 3507b97279..2b4ac3258c 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff --git a/PCbuild/python.props b/PCbuild/python.props -index 74ba0a9419..e7996c9ad3 100644 +index b7f958193c..fe3fd7bad2 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -65,7 +65,7 @@ diff --git a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch index 349c8bca..139765e8 100644 --- a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch +++ b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch @@ -1,4 +1,4 @@ -From 315adebfd9ed1d8efa1650494d25bf6996b5d1cf Mon Sep 17 00:00:00 2001 +From 5ae268703ce08a0fda90ce44c6e502cdd3279c35 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 3 Nov 2019 15:09:45 -0600 Subject: [PATCH 12/25] Use ranlib from env if env variable is set diff --git a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch index 70993c42..eea99a90 100644 --- a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 9d4c38e5e2d1093bc1dfd207efa35b24b7acea53 Mon Sep 17 00:00:00 2001 +From 86f3a2a310efbb6d9825e7c4c8339ae8e1df2787 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 13/25] Add CondaEcosystemModifyDllSearchPath() diff --git a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch index 8bb433c8..9450d800 100644 --- a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch +++ b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch @@ -1,4 +1,4 @@ -From 0d8d96d040b27e5bfeddb99286b08069925b9158 Mon Sep 17 00:00:00 2001 +From 8bab6d46315cc02d2293b44308ff2b178c78f61f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 20:46:36 +0100 Subject: [PATCH 14/25] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable diff --git a/recipe/patches/0015-Doing-d1trimfile.patch b/recipe/patches/0015-Doing-d1trimfile.patch index e019cce4..8b31956c 100644 --- a/recipe/patches/0015-Doing-d1trimfile.patch +++ b/recipe/patches/0015-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 571cfb77387deeb7f1f30b06adc9ea27bcb34e14 Mon Sep 17 00:00:00 2001 +From b5cd52035a412eb58d573f70aedf0867d40030f6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 15/25] Doing d1trimfile diff --git a/recipe/patches/0016-cross-compile-darwin.patch b/recipe/patches/0016-cross-compile-darwin.patch index 611117a7..32d039c8 100644 --- a/recipe/patches/0016-cross-compile-darwin.patch +++ b/recipe/patches/0016-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From c1e212b6361b39198edfa5e480f989e968d5975a Mon Sep 17 00:00:00 2001 +From 6a70dba3153d5fd4012dcd1a8364df5b1576ae93 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 16/25] cross compile darwin diff --git a/recipe/patches/0017-Fix-TZPATH-on-windows.patch b/recipe/patches/0017-Fix-TZPATH-on-windows.patch index 37f1759e..d32997c5 100644 --- a/recipe/patches/0017-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0017-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From fabf35d11c40f1ac9db0911b527a1674898031cc Mon Sep 17 00:00:00 2001 +From 2fae113c00537ec301afaa4fda86c5cb90cc8a9e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 17/25] Fix TZPATH on windows diff --git a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 6a199370..525129ca 100644 --- a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,4 +1,4 @@ -From 9f936c9c1ada694a87e89933d1a5bf0a921df6f3 Mon Sep 17 00:00:00 2001 +From f73b4815e527627674cf8c052d5d37d9da5529c6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 18/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1 diff --git a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch index bda39338..568d1441 100644 --- a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch +++ b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch @@ -1,4 +1,4 @@ -From b01e94b846429dd62d447b3f06dbb8c95d36ad7e Mon Sep 17 00:00:00 2001 +From 54902079aabfe40fb40ce2efb903da6001e3f9e2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:18:50 -0700 Subject: [PATCH 19/25] Fix LDSHARED when CC is overriden on Linux too diff --git a/recipe/patches/0020-Unvendor-bzip2.patch b/recipe/patches/0020-Unvendor-bzip2.patch index 649f5956..555ca9f6 100644 --- a/recipe/patches/0020-Unvendor-bzip2.patch +++ b/recipe/patches/0020-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 2f56d1e575e2b67aa7ec65a40dc488912c8d5896 Mon Sep 17 00:00:00 2001 +From 2205362f7a6e790a4b16492b039d7fde6cfbcf05 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 20/25] Unvendor bzip2 diff --git a/recipe/patches/0021-Unvendor-libffi.patch b/recipe/patches/0021-Unvendor-libffi.patch index 9e06cffa..a2d34f1c 100644 --- a/recipe/patches/0021-Unvendor-libffi.patch +++ b/recipe/patches/0021-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 462a272b47ccd0da3b7b38fa43cb35a19ce7dd4b Mon Sep 17 00:00:00 2001 +From e26c73100163e6b4f08c1cff98df0cfcd0d99f1e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 21/25] Unvendor libffi diff --git a/recipe/patches/0022-Unvendor-tcltk.patch b/recipe/patches/0022-Unvendor-tcltk.patch index 4ca62f8c..ccb00b4f 100644 --- a/recipe/patches/0022-Unvendor-tcltk.patch +++ b/recipe/patches/0022-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 3810953d1564ecb9717c8417d283fe1a506bf6fd Mon Sep 17 00:00:00 2001 +From b201ef5cfba1ffb2774baa5eeee5d25a55904d40 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 22/25] Unvendor tcltk diff --git a/recipe/patches/0023-unvendor-xz.patch b/recipe/patches/0023-unvendor-xz.patch index 512a2f06..9fae889a 100644 --- a/recipe/patches/0023-unvendor-xz.patch +++ b/recipe/patches/0023-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 176f067683eb1798927f49cd77cc9936232ca3cd Mon Sep 17 00:00:00 2001 +From 343f6c661aecad27b09171f0db30cced94a2b6f9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 23/25] unvendor xz diff --git a/recipe/patches/0024-unvendor-zlib.patch b/recipe/patches/0024-unvendor-zlib.patch index 0b7015b6..87aadfaf 100644 --- a/recipe/patches/0024-unvendor-zlib.patch +++ b/recipe/patches/0024-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 9f44bbb6a50d8f9c7d86407fa83fa78ceee30ac2 Mon Sep 17 00:00:00 2001 +From 7e8c6c64aec18fee7239301d2be0df03c504b98b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 24/25] unvendor zlib diff --git a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 2d2f4582..6f0de098 100644 --- a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,4 +1,4 @@ -From e156f47aa64748d9393688c403c1d45db2a02360 Mon Sep 17 00:00:00 2001 +From ca4c074efc06a5c3017f3aae78bab84b529a0927 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 25/25] Do not pass -g to GCC when not Py_DEBUG From 1856df42405398b54da0ef30efc507c58cd64dc5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:50:17 +1100 Subject: [PATCH 3/6] remove redundant .gitattributes/.gitignore in recipe backport of 7994a6ff1dc690a4832895b31ad3ae9c94ae1472 --- recipe/.gitattributes | 24 ------------------------ recipe/.gitignore | 3 --- 2 files changed, 27 deletions(-) delete mode 100644 recipe/.gitattributes delete mode 100644 recipe/.gitignore diff --git a/recipe/.gitattributes b/recipe/.gitattributes deleted file mode 100644 index 86ff9377..00000000 --- a/recipe/.gitattributes +++ /dev/null @@ -1,24 +0,0 @@ -* text=auto - -*.patch binary -*.diff binary -meta.yaml text eol=lf -build.sh text eol=lf -bld.bat text eol=crlf - -# github helper pieces to make some files not show up in diffs automatically -.azure-pipelines/* linguist-generated=true -.circleci/* linguist-generated=true -.drone/* linguist-generated=true -.drone.yml linguist-generated=true -.github/* linguist-generated=true -.travis/* linguist-generated=true -.appveyor.yml linguist-generated=true -.gitattributes linguist-generated=true -.gitignore linguist-generated=true -.travis.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true -azure-pipelines.yml linguist-generated=true -build-locally.py linguist-generated=true -shippable.yml linguist-generated=true diff --git a/recipe/.gitignore b/recipe/.gitignore deleted file mode 100644 index c89ecb7d..00000000 --- a/recipe/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.pyc - -build_artifacts From 40e1812cf599c21d06661bb7cb6164fc13d8fc16 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:55:49 +1100 Subject: [PATCH 4/6] remove obsolete abi_migration_branches from conda-forge.yml --- conda-forge.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index a660604b..b1f45185 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,11 +1,6 @@ build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true provider: {linux_aarch64: default, linux_ppc64le: native} -bot: - abi_migration_branches: - - 3.7 - - 3.8 - - 3.9 azure: store_build_artifacts: true github: From 9067b1ca0f2b96c35bc8775a0ba0dd2b440bc4aa Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:56:39 +1100 Subject: [PATCH 5/6] stop storing build artefacts --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index b1f45185..cac884c2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,6 @@ build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true provider: {linux_aarch64: default, linux_ppc64le: native} -azure: - store_build_artifacts: true github: branch_name: main tooling_branch_name: main From 4fc63ed56af4de3eb13019d61b3319237fd2650c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Mar 2024 15:58:14 +1100 Subject: [PATCH 6/6] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and conda-forge-pinning 2024.03.19.15.37.47 --- .azure-pipelines/azure-pipelines-linux.yml | 33 +----- .azure-pipelines/azure-pipelines-osx.yml | 34 +------ .azure-pipelines/azure-pipelines-win.yml | 30 +----- .gitignore | 13 ++- .scripts/build_steps.sh | 12 +-- .scripts/create_conda_build_artifacts.bat | 80 --------------- .scripts/create_conda_build_artifacts.sh | 113 --------------------- .scripts/run_docker_build.sh | 6 ++ .scripts/run_osx_build.sh | 6 +- .scripts/run_win_build.bat | 4 +- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 12 files changed, 36 insertions(+), 304 deletions(-) delete mode 100755 .scripts/create_conda_build_artifacts.bat delete mode 100755 .scripts/create_conda_build_artifacts.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bf435332..875d9966 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,8 +12,8 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_ timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -41,33 +41,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=build_artifacts - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 23d810a2..730a6268 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,12 +11,11 @@ jobs: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_ osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_ timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? @@ -38,33 +37,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8be59069..d609fcdf 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,7 +11,6 @@ jobs: win_64_: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -50,31 +49,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - set CI=azure - set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - set FEEDSTOCK_NAME=$(build.Repository.Name) - set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) - set CONDA_BLD_DIR=$(CONDA_BLD_PATH) - set BLD_ARTIFACT_PREFIX=conda_artifacts - if "%AGENT_JOBSTATUS%" == "Failed" ( - set ENV_ARTIFACT_PREFIX=conda_envs - ) - call ".scripts\create_conda_build_artifacts.bat" - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.gitignore b/.gitignore index c0029107..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5cfb40c4..e3deaae4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -65,12 +65,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -82,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat deleted file mode 100755 index 2853cfdc..00000000 --- a/.scripts/create_conda_build_artifacts.bat +++ /dev/null @@ -1,80 +0,0 @@ -setlocal enableextensions enabledelayedexpansion - -rem INPUTS (environment variables that need to be set before calling this script): -rem -rem CI (azure/github_actions/UNSET) -rem CI_RUN_ID (unique identifier for the CI job run) -rem FEEDSTOCK_NAME -rem CONFIG (build matrix configuration string) -rem SHORT_CONFIG (uniquely-shortened configuration string) -rem CONDA_BLD_DIR (path to the conda-bld directory) -rem ARTIFACT_STAGING_DIR (use working directory if unset) -rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) -rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) - -rem OUTPUTS -rem -rem BLD_ARTIFACT_NAME -rem BLD_ARTIFACT_PATH -rem ENV_ARTIFACT_NAME -rem ENV_ARTIFACT_PATH - -rem Check that the conda-build directory exists -if not exist %CONDA_BLD_DIR% ( - echo conda-build directory does not exist - exit 1 -) - -if not defined ARTIFACT_STAGING_DIR ( - rem Set staging dir to the working dir - set ARTIFACT_STAGING_DIR=%cd% -) - -rem Set a unique ID for the artifact(s), specialized for this particular job run -set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% -if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( - set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% -) - -rem Set a descriptive ID for the archive(s), specialized for this particular job run -set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% - -rem Make the build artifact zip -if defined BLD_ARTIFACT_PREFIX ( - set BLD_ARTIFACT_NAME=%BLD_ARTIFACT_PREFIX%_%ARTIFACT_UNIQUE_ID% - echo BLD_ARTIFACT_NAME: !BLD_ARTIFACT_NAME! - - set "BLD_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%BLD_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" - 7z a "!BLD_ARTIFACT_PATH!" "%CONDA_BLD_DIR%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb - if errorlevel 1 exit 1 - echo BLD_ARTIFACT_PATH: !BLD_ARTIFACT_PATH! - - if "%CI%" == "azure" ( - echo ##vso[task.setVariable variable=BLD_ARTIFACT_NAME]!BLD_ARTIFACT_NAME! - echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! - ) - if "%CI%" == "github_actions" ( - echo BLD_ARTIFACT_NAME=!BLD_ARTIFACT_NAME!>> !GITHUB_OUTPUT! - echo BLD_ARTIFACT_PATH=!BLD_ARTIFACT_PATH!>> !GITHUB_OUTPUT! - ) -) - -rem Make the environments artifact zip -if defined ENV_ARTIFACT_PREFIX ( - set ENV_ARTIFACT_NAME=!ENV_ARTIFACT_PREFIX!_%ARTIFACT_UNIQUE_ID% - echo ENV_ARTIFACT_NAME: !ENV_ARTIFACT_NAME! - - set "ENV_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%ENV_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" - 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_DIR%"/_*_env*/ -bb - if errorlevel 1 exit 1 - echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! - - if "%CI%" == "azure" ( - echo ##vso[task.setVariable variable=ENV_ARTIFACT_NAME]!ENV_ARTIFACT_NAME! - echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! - ) - if "%CI%" == "github_actions" ( - echo ENV_ARTIFACT_NAME=!ENV_ARTIFACT_NAME!>> !GITHUB_OUTPUT! - echo ENV_ARTIFACT_PATH=!ENV_ARTIFACT_PATH!>> !GITHUB_OUTPUT! - ) -) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh deleted file mode 100755 index 17ec0868..00000000 --- a/.scripts/create_conda_build_artifacts.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -# INPUTS (environment variables that need to be set before calling this script): -# -# CI (azure/github_actions/UNSET) -# CI_RUN_ID (unique identifier for the CI job run) -# FEEDSTOCK_NAME -# CONFIG (build matrix configuration string) -# SHORT_CONFIG (uniquely-shortened configuration string) -# CONDA_BLD_DIR (path to the conda-bld directory) -# ARTIFACT_STAGING_DIR (use working directory if unset) -# BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) -# ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) - -# OUTPUTS -# -# BLD_ARTIFACT_NAME -# BLD_ARTIFACT_PATH -# ENV_ARTIFACT_NAME -# ENV_ARTIFACT_PATH - -source .scripts/logging_utils.sh - -# DON'T do set -x, because it results in double echo-ing pipeline commands -# and that might end up inserting extraneous quotation marks in output variables -set -e - -# Check that the conda-build directory exists -if [ ! -d "$CONDA_BLD_DIR" ]; then - echo "conda-build directory does not exist" - exit 1 -fi - -# Set staging dir to the working dir, in Windows style if applicable -if [[ -z "${ARTIFACT_STAGING_DIR}" ]]; then - if pwd -W; then - ARTIFACT_STAGING_DIR=$(pwd -W) - else - ARTIFACT_STAGING_DIR=$PWD - fi -fi -echo "ARTIFACT_STAGING_DIR: $ARTIFACT_STAGING_DIR" - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -if [ -z ${FEEDSTOCK_NAME} ]; then - export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) -fi - -# Set a unique ID for the artifact(s), specialized for this particular job run -ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" -if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then - ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" -fi -echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" - -# Set a descriptive ID for the archive(s), specialized for this particular job run -ARCHIVE_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" - -# Make the build artifact zip -if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then - export BLD_ARTIFACT_NAME="${BLD_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" - export BLD_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${BLD_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" - - ( startgroup "Archive conda build directory" ) 2> /dev/null - - # Try 7z and fall back to zip if it fails (for cross-platform use) - if ! 7z a "$BLD_ARTIFACT_PATH" "$CONDA_BLD_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then - pushd "$CONDA_BLD_DIR" - zip -r -y -T "$BLD_ARTIFACT_PATH" . -x '*.git/*' '*_*_env*/*' '*_cache/*' - popd - fi - - ( endgroup "Archive conda build directory" ) 2> /dev/null - - echo "BLD_ARTIFACT_NAME: $BLD_ARTIFACT_NAME" - echo "BLD_ARTIFACT_PATH: $BLD_ARTIFACT_PATH" - - if [[ "$CI" == "azure" ]]; then - echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" - echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" - elif [[ "$CI" == "github_actions" ]]; then - echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT - echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT - fi -fi - -# Make the environments artifact zip -if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then - export ENV_ARTIFACT_NAME="${ENV_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" - export ENV_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${ENV_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" - - ( startgroup "Archive conda build environments" ) 2> /dev/null - - # Try 7z and fall back to zip if it fails (for cross-platform use) - if ! 7z a "$ENV_ARTIFACT_PATH" -r "$CONDA_BLD_DIR"/'_*_env*/' -bb; then - pushd "$CONDA_BLD_DIR" - zip -r -y -T "$ENV_ARTIFACT_PATH" . -i '*_*_env*/*' - popd - fi - - ( endgroup "Archive conda build environments" ) 2> /dev/null - - echo "ENV_ARTIFACT_NAME: $ENV_ARTIFACT_NAME" - echo "ENV_ARTIFACT_PATH: $ENV_ARTIFACT_PATH" - - if [[ "$CI" == "azure" ]]; then - echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" - echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" - elif [[ "$CI" == "github_actions" ]]; then - echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT - echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT - fi -fi \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..07dff219 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de9..6d546976 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." )