From c8edd94756b06ea8504ef8d00584524cc1ecb4f1 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 18:05:44 -0700 Subject: [PATCH 01/25] update version and sha256 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b8b5a5..cbc4ee2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "y-py" %} -{% set version = "0.5.9" %} +{% set version = "0.6.2" %} package: name: {{ name }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/y/y_py/y_py-{{ version }}.tar.gz - sha256: 50cfa0532bcee27edb8c64743b49570e28bb76a00cd384ead1d84b6f052d9368 + sha256: 4757a82a50406a0b3a333aa0122019a331bd6f16e49fed67dca423f928b3fd4d build: number: 0 From 3a89760c8f9391490099279583f8286517386916 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 18:05:56 -0700 Subject: [PATCH 02/25] update dependencies --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cbc4ee2..f160900 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,12 +21,12 @@ build: requirements: build: - python - - maturin >=0.13,<0.14 + - maturin >=1.2.3,<2 - {{ compiler('c') }} - {{ compiler('rust') }} - cargo-bundle-licenses host: - - maturin =0.13.7 + - maturin >=1.2.3,<2 - pip - python - wheel From 6508dfab01cbf14accfcea1ce1b99ca1508dd02a Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 19:52:07 -0700 Subject: [PATCH 03/25] add staging channel --- abs.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 abs.yaml diff --git a/abs.yaml b/abs.yaml new file mode 100644 index 0000000..10c8f0f --- /dev/null +++ b/abs.yaml @@ -0,0 +1,2 @@ +channels: + - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/bacfebb \ No newline at end of file From e1236f224bcb7a15a46f1445bd37bf91ced63f8f Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 20:06:41 -0700 Subject: [PATCH 04/25] try pinning maturin --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f160900..692f821 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ requirements: - {{ compiler('rust') }} - cargo-bundle-licenses host: - - maturin >=1.2.3,<2 + - maturin 1.3.1 - pip - python - wheel From df4174a0f606c59f9afdfadb5dfb92293b20bfe5 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 20:20:15 -0700 Subject: [PATCH 05/25] add setuptools --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 692f821..d5dd344 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,7 @@ requirements: - pip - python - wheel + - setuptools run: # this is needed otherwise import y_py in tests fails with ModuleNotFoundError - python From 24ed5208998c35d2419dc52ee84c1e4ef3602036 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 17:46:24 -0600 Subject: [PATCH 06/25] add staging channel; --- abs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abs.yaml b/abs.yaml index 10c8f0f..98b245e 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,2 +1,3 @@ channels: - - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/bacfebb \ No newline at end of file + - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/1481b8e + - - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/b2372ac \ No newline at end of file From bbe77c2adc4e3f270b0a266cdc1228a84b0eda38 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 17:47:24 -0600 Subject: [PATCH 07/25] add build_config --- recipe/conda_build_config.yaml | 9 +++++++++ 1 file changed, 9 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 0000000..81cb360 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,9 @@ +rust_compiler: + - rust +rust_compiler_version: + - 1.76.0 +# use {{ compiler('rust-gnu') }} when requiring a build using the m2w64-toolchain +rust_gnu_compiler: # [win] + - rust-gnu # [win] +rust_gnu_compiler_version: # [win] + - 1.76.0 # [win] \ No newline at end of file From 2f20fa247fb36a8037d7b9ec257cd6059fd627a1 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 17:51:07 -0600 Subject: [PATCH 08/25] remove build_config --- recipe/conda_build_config.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 81cb360..0000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -rust_compiler: - - rust -rust_compiler_version: - - 1.76.0 -# use {{ compiler('rust-gnu') }} when requiring a build using the m2w64-toolchain -rust_gnu_compiler: # [win] - - rust-gnu # [win] -rust_gnu_compiler_version: # [win] - - 1.76.0 # [win] \ No newline at end of file From bc6ad7812f3be4409ec1c936fbb9eb618cde9b7c Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 17:55:29 -0600 Subject: [PATCH 09/25] fix typo --- abs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs.yaml b/abs.yaml index 98b245e..6926df0 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,3 +1,3 @@ channels: - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/1481b8e - - - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/b2372ac \ No newline at end of file + - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/b2372ac \ No newline at end of file From 2a0fdc72271db7de100144eadb90449d8d3f7fe9 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 18:16:01 -0600 Subject: [PATCH 10/25] add osx constrains --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d5dd344..55926e3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,10 @@ build: - python requirements: + build: + run_exports: # [osx and x86_64] + strong_constrains: # [osx and x86_64] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] build: - python - maturin >=1.2.3,<2 From dbf109d92c684d29af642f84a912850553017c1b Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 09:48:17 -0600 Subject: [PATCH 11/25] update compiler version for osx --- .ci_support/osx_64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- recipe/meta.yaml | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index c21871e..8e9e317 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 2fb3244..5d348e4 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index 6cef6bb..81d3071 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 85baa00..602c620 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index 1ba80d0..c747936 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 0afefde..507ab90 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' c_compiler: - clang c_compiler_version: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 55926e3..75d3b09 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,10 +19,10 @@ build: - python requirements: - build: - run_exports: # [osx and x86_64] - strong_constrains: # [osx and x86_64] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] + # build: + # run_exports: # [osx and x86_64] + # strong_constrains: # [osx and x86_64] + # - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] build: - python - maturin >=1.2.3,<2 From 05a9716649fd23b88ed759356f05f822fc3d4390 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 09:57:54 -0600 Subject: [PATCH 12/25] test --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 75d3b09..55926e3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,10 +19,10 @@ build: - python requirements: - # build: - # run_exports: # [osx and x86_64] - # strong_constrains: # [osx and x86_64] - # - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] + build: + run_exports: # [osx and x86_64] + strong_constrains: # [osx and x86_64] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] build: - python - maturin >=1.2.3,<2 From c0bbc80d630bfc1f5f07da96ee3f2ad5cdd46a68 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 10:14:26 -0600 Subject: [PATCH 13/25] add cpython.yaml for 3.12 --- .../osx_64_python3.12.____cpython.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..602c620 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,22 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.12' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-64 From e19134767eacccea42b9ae12d4e0f026d193acbb Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 12:25:02 -0600 Subject: [PATCH 14/25] revert conda-forge config files --- .../linux_ppc64le_python3.10.____cpython.yaml | 22 ------------------- .../linux_ppc64le_python3.11.____cpython.yaml | 22 ------------------- .../linux_ppc64le_python3.8.____73_pypy.yaml | 22 ------------------- .../linux_ppc64le_python3.8.____cpython.yaml | 22 ------------------- .../linux_ppc64le_python3.9.____73_pypy.yaml | 22 ------------------- .../linux_ppc64le_python3.9.____cpython.yaml | 22 ------------------- .../osx_64_python3.10.____cpython.yaml | 2 +- .../osx_64_python3.11.____cpython.yaml | 2 +- .../osx_64_python3.12.____cpython.yaml | 22 ------------------- .ci_support/osx_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- 13 files changed, 6 insertions(+), 160 deletions(-) delete mode 100644 .ci_support/linux_ppc64le_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.8.____73_pypy.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.9.____73_pypy.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml deleted file mode 100644 index 526b469..0000000 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml deleted file mode 100644 index 2a4125d..0000000 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml deleted file mode 100644 index 278ae92..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml deleted file mode 100644 index 6572469..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml deleted file mode 100644 index 1d116af..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml deleted file mode 100644 index f561ca5..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 8e9e317..c21871e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 5d348e4..2fb3244 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml deleted file mode 100644 index 602c620..0000000 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -rust_compiler: -- rust -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index 81d3071..6cef6bb 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 602c620..85baa00 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index c747936..1ba80d0 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 507ab90..0afefde 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.9' c_compiler: - clang c_compiler_version: From 84560bf5b51ace5b4547a6577e0a15f65eb7304a Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 12:25:34 -0600 Subject: [PATCH 15/25] pin osx to 10.12 --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 55926e3..65b5a9a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,7 @@ requirements: run: # this is needed otherwise import y_py in tests fails with ModuleNotFoundError - python + - __osx >=10.12 # [osx and x86_64] test: source_files: From a3e721605d3010754d653eb48174a3ad3a426330 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 14 Mar 2024 12:30:04 -0600 Subject: [PATCH 16/25] add conda_build_config --- recipe/conda_build_config.yaml | 13 +++++++++++++ 1 file changed, 13 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 0000000..ada861f --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,13 @@ +rust_compiler: + - rust +rust_compiler_version: + - 1.76.0 +# use {{ compiler('rust-gnu') }} when requiring a build using the m2w64-toolchain +rust_gnu_compiler: # [win] + - rust-gnu # [win] +rust_gnu_compiler_version: # [win] + - 1.76.0 # [win] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.12" # [osx and x86_64] +rust_compiler_version: + - 1.76.0 \ No newline at end of file From e3b087ce4d4f87badbb528a90a3b73300eba54d3 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 09:55:12 -0600 Subject: [PATCH 17/25] move osx contraints to main build section --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 65b5a9a..7722471 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,9 @@ source: sha256: 4757a82a50406a0b3a333aa0122019a331bd6f16e49fed67dca423f928b3fd4d build: + run_exports: # [osx and x86_64] + strong_constrains: # [osx and x86_64] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] number: 0 skip: True # [s390x] script: @@ -19,10 +22,6 @@ build: - python requirements: - build: - run_exports: # [osx and x86_64] - strong_constrains: # [osx and x86_64] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] build: - python - maturin >=1.2.3,<2 From f13a4ca21151813bd5708051b0aa9ec23680f00c Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 11:50:31 -0600 Subject: [PATCH 18/25] add CONDA_BUILD_SYSROOT --- recipe/conda_build_config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index ada861f..9e519e3 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -10,4 +10,6 @@ rust_gnu_compiler_version: # [win] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "10.12" # [osx and x86_64] rust_compiler_version: - - 1.76.0 \ No newline at end of file + - 1.76.0 +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.12.sdk # [osx and x86_64] \ No newline at end of file From 45843aae9a182b32c5df0546b98065e4d8131995 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 12:59:03 -0600 Subject: [PATCH 19/25] clean cbc --- recipe/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9e519e3..4e18603 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,7 +9,5 @@ rust_gnu_compiler_version: # [win] - 1.76.0 # [win] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "10.12" # [osx and x86_64] -rust_compiler_version: - - 1.76.0 CONDA_BUILD_SYSROOT: - /opt/MacOSX10.12.sdk # [osx and x86_64] \ No newline at end of file From 34a8a86ff533a64049c6eab597fb3e36d4add563 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 12:59:17 -0600 Subject: [PATCH 20/25] remove setuptools and wheel --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7722471..491865d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,8 +32,6 @@ requirements: - maturin 1.3.1 - pip - python - - wheel - - setuptools run: # this is needed otherwise import y_py in tests fails with ModuleNotFoundError - python From d581669b405764fcc2ba11fded4e2465bf93e05f Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 13:01:23 -0600 Subject: [PATCH 21/25] remove osx restraints from recipe --- recipe/meta.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 491865d..dc3dc19 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,7 @@ source: sha256: 4757a82a50406a0b3a333aa0122019a331bd6f16e49fed67dca423f928b3fd4d build: - run_exports: # [osx and x86_64] - strong_constrains: # [osx and x86_64] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] - number: 0 +number: 0 skip: True # [s390x] script: - {{ PYTHON }} -m pip install --no-deps --no-build-isolation . -vv @@ -35,7 +32,6 @@ requirements: run: # this is needed otherwise import y_py in tests fails with ModuleNotFoundError - python - - __osx >=10.12 # [osx and x86_64] test: source_files: From 7c3f6489307ed8cbc51aeabd751b0a11487d8218 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 13:05:12 -0600 Subject: [PATCH 22/25] fix typo --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc3dc19..997afd3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 4757a82a50406a0b3a333aa0122019a331bd6f16e49fed67dca423f928b3fd4d build: -number: 0 + number: 0 skip: True # [s390x] script: - {{ PYTHON }} -m pip install --no-deps --no-build-isolation . -vv From 814e88bd441fa9245064a4dc8c5210ca3823e8de Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 18 Mar 2024 14:36:14 -0600 Subject: [PATCH 23/25] update abs.yaml --- abs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs.yaml b/abs.yaml index 6926df0..2de666d 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,3 +1,3 @@ channels: - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/1481b8e - - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/b2372ac \ No newline at end of file + - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/433790c \ No newline at end of file From 4c5c04d5659a642222bde8953f37899591456c5f Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Tue, 19 Mar 2024 15:50:45 -0400 Subject: [PATCH 24/25] update temp channel --- abs.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/abs.yaml b/abs.yaml index 2de666d..c2b1ff1 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,3 +1,2 @@ channels: - - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/1481b8e - - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/433790c \ No newline at end of file + - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/9e03849 \ No newline at end of file From fad64168d4fb58286ea8c040244d3451fef6c459 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 20 Mar 2024 09:03:38 -0600 Subject: [PATCH 25/25] remove staging channels --- abs.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 abs.yaml diff --git a/abs.yaml b/abs.yaml deleted file mode 100644 index 2de666d..0000000 --- a/abs.yaml +++ /dev/null @@ -1,3 +0,0 @@ -channels: - - https://staging.continuum.io/prefect/fs/rust-feedstock/pr7/1481b8e - - https://staging.continuum.io/prefect/fs/rust-activation-feedstock/pr6/433790c \ No newline at end of file