From 2e3d4b95d4b88cc91c0202f63e47d3ccebecfdf7 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 15 Sep 2022 17:23:42 -0700 Subject: [PATCH 01/28] Update to v13.2 --- recipe/meta.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e5e4b62..d59fcc9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "maturin" %} -{% set version = "0.11.5" %} +{% set version = "0.13.2" %} package: name: {{ name }} @@ -7,31 +7,29 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 07074778b063a439fdfd5501bd1d1823a216ec5b657d3ecde78fd7f2c4782422 + sha256: 18882138e633d32e7a18d147ec38c71930db254817f3714e9fd70e01e379e255 build: - number: 1 - skip: true # [py27] + number: 0 + skip: True # [py<37] missing_dso_whitelist: # [osx] - /usr/lib/libresolv.9.dylib # [osx] requirements: build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - {{ compiler('c') }} # [unix] - {{ compiler('m2w64_c') }} # [win] - # seems to work with defaults from conda-forge-pinning (at the moment) - - rust # [not osx] - # investigating... - - rust >=1.54 # [osx] + - {{ compiler('rust') }} host: - pip - python - - toml + - setuptools + - setuptools-rust >=1.4.0 + - wheel >=0.36.2 + - tomli >=1.1.0 run: - python - - toml >=0.10.2,<0.11 + - tomli >=1.1.0 test: commands: From 7caec3dff4e13d3883d253efc3bca2ae3f3eb460 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 15 Sep 2022 17:24:03 -0700 Subject: [PATCH 02/28] Update for rust 1.63.0 --- recipe/conda_build_config.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4c495b8..465d7f0 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,2 @@ -# Please consult conda-forge/core before doing this -MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.12" # [osx and x86_64] +rust_compiler_version: + - 1.63.0 From 00877878f3c73de73eaa5bf6befe0c4716f51f37 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 15 Sep 2022 17:24:13 -0700 Subject: [PATCH 03/28] Add abs.yaml --- 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..536095e --- /dev/null +++ b/abs.yaml @@ -0,0 +1,2 @@ +channels: + - anaconda-server From a7e62bc2a4839b542b0ade3908590dc82ecd8827 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 19 Sep 2022 11:05:06 -0700 Subject: [PATCH 04/28] Update to v13.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d59fcc9..10fa56c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "maturin" %} -{% set version = "0.13.2" %} +{% set version = "0.13.3" %} package: name: {{ name }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 18882138e633d32e7a18d147ec38c71930db254817f3714e9fd70e01e379e255 + sha256: edeb8ecaa5cc6e6d2f50a32289798d7ca046c33481ac24f74805ff289af6afe4 build: number: 0 From 43c74e01e471977974a105036eee97f5fd25d896 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 19 Sep 2022 11:06:53 -0700 Subject: [PATCH 05/28] Update URLs --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10fa56c..5bc3ee3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,12 +36,14 @@ test: - maturin --help about: - home: https://github.com/PyO3/maturin + home: https://maturin.rs/ license: MIT license_family: MIT license_file: license-mit summary: >- Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages + dev_url: https://github.com/PyO3/maturin + doc_url: https://maturin.rs/ extra: recipe-maintainers: From 6136e4a6c7e8c50c67e62a01d59b67233e6633e4 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 19 Sep 2022 11:07:30 -0700 Subject: [PATCH 06/28] Update license --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5bc3ee3..677c0e6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,7 @@ test: about: home: https://maturin.rs/ - license: MIT + license: MIT and Apache-2.0 license_family: MIT license_file: license-mit summary: >- From 6371a84c1ba17a7a2c1ceaab76413e8acca7d897 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 20 Sep 2022 13:55:18 -0700 Subject: [PATCH 07/28] Add build_parameters --- abs.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/abs.yaml b/abs.yaml index 536095e..a722356 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,2 +1,6 @@ channels: - anaconda-server +build_parameters: + - "--suppress-variables" + - "--error-overlinking" + - "--error-overdepending" From bb671fe2541b1bf7ab9f3f3989f255624319a797 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 22 Sep 2022 10:36:32 -0700 Subject: [PATCH 08/28] Add rust environment --- recipe/bld.bat | 5 +++++ recipe/build.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 26e1626..54f8ca5 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,6 +1,11 @@ REM Based on bld.bat from pysyntect-feedstock REM https://github.com/conda-forge/pysyntect-feedstock/ +REM Set up rust environment +set CARGO_HOME=%CONDA_PREFIX%\.cargo.win +set CARGO_CONFIG=%CARGO_HOME%\config +set RUSTUP_HOME=%CARGO_HOME%\rustup + REM Create temp folder mkdir tmpbuild_%PY_VER% set TEMP=%CD%\tmpbuild_%PY_VER% diff --git a/recipe/build.sh b/recipe/build.sh index 660a0bc..93ff4b8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,10 +2,10 @@ # https://github.com/conda-forge/pysyntect-feedstock/ set -ex -# Set conda CC as custom CC in Rust -export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=$CC -export CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER=$CC -export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER=$CC +# Set up rust environment +export CARGO_HOME=${CONDA_PREFIX}/.cargo.$(uname) +export CARGO_CONFIG=${CARGO_HOME}/config +export RUSTUP_HOME=${CARGO_HOME}/rustup # Print Rust version rustc --version From 44bfac96a52ebe6a5752a531010a5f75845dd74b Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 22 Sep 2022 12:44:41 -0700 Subject: [PATCH 09/28] Add C compiler to osx --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 677c0e6..8174412 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ build: requirements: build: - - {{ compiler('c') }} # [unix] + - {{ compiler('c') }} # [not win] - {{ compiler('m2w64_c') }} # [win] - {{ compiler('rust') }} host: From daa208a674908129349b981419d5bf33979d09e0 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Fri, 23 Sep 2022 14:00:24 -0700 Subject: [PATCH 10/28] Skip s390x --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8174412..ad74958 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,9 @@ source: build: number: 0 - skip: True # [py<37] + # ring (dependency loaded via cargo) is not supported on s390x yet + # https://github.com/briansmith/ring/issues/1511 + skip: True # [py<37 or s390x] missing_dso_whitelist: # [osx] - /usr/lib/libresolv.9.dylib # [osx] From 16f076b86e57fa5a49c804754e8f2976ba841394 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 26 Sep 2022 12:36:05 -0700 Subject: [PATCH 11/28] Add posix to test requirements for windows gnu compiler --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad74958..61c36a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,8 @@ requirements: - tomli >=1.1.0 test: + requires: + - posix # [win] commands: - maturin --help From 9cee723019e7407afc109a7e1206f2e2517849ad Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Mon, 26 Sep 2022 12:59:12 -0700 Subject: [PATCH 12/28] Change white space to re-trigger dispatch --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61c36a7..ecd6c75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,8 +19,8 @@ build: requirements: build: - - {{ compiler('c') }} # [not win] - - {{ compiler('m2w64_c') }} # [win] + - {{ compiler('c') }} # [not win] + - {{ compiler('m2w64_c') }} # [win] - {{ compiler('rust') }} host: - pip From 42f68a5b82c29cf6e3f869ab79c265237ab6525a Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 6 Oct 2022 11:38:55 -0700 Subject: [PATCH 13/28] Separate msvc and gnu builds --- recipe/{bld.bat => bld-win.bat} | 6 ++- recipe/{build.sh => build-unix.sh} | 0 recipe/meta.yaml | 69 ++++++++++++++++++++---------- 3 files changed, 50 insertions(+), 25 deletions(-) rename recipe/{bld.bat => bld-win.bat} (80%) rename recipe/{build.sh => build-unix.sh} (100%) diff --git a/recipe/bld.bat b/recipe/bld-win.bat similarity index 80% rename from recipe/bld.bat rename to recipe/bld-win.bat index 54f8ca5..ccdd20a 100644 --- a/recipe/bld.bat +++ b/recipe/bld-win.bat @@ -6,9 +6,11 @@ set CARGO_HOME=%CONDA_PREFIX%\.cargo.win set CARGO_CONFIG=%CARGO_HOME%\config set RUSTUP_HOME=%CARGO_HOME%\rustup +echo "Building %PKG_NAME%" + REM Create temp folder -mkdir tmpbuild_%PY_VER% -set TEMP=%CD%\tmpbuild_%PY_VER% +mkdir %CD%\tmpbuild_%PKG_NAME%_%PY_VER% +set TEMP=%CD%\tmpbuild_%PKG_NAME%_%PY_VER% REM Print Rust version rustc --version diff --git a/recipe/build.sh b/recipe/build-unix.sh similarity index 100% rename from recipe/build.sh rename to recipe/build-unix.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ecd6c75..bd258b8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set version = "0.13.3" %} package: - name: {{ name }} + name: {{ name }}-suite version: {{ version }} source: @@ -14,30 +14,53 @@ build: # ring (dependency loaded via cargo) is not supported on s390x yet # https://github.com/briansmith/ring/issues/1511 skip: True # [py<37 or s390x] - missing_dso_whitelist: # [osx] - - /usr/lib/libresolv.9.dylib # [osx] -requirements: - build: - - {{ compiler('c') }} # [not win] - - {{ compiler('m2w64_c') }} # [win] - - {{ compiler('rust') }} - host: - - pip - - python - - setuptools - - setuptools-rust >=1.4.0 - - wheel >=0.36.2 - - tomli >=1.1.0 - run: - - python - - tomli >=1.1.0 -test: - requires: - - posix # [win] - commands: - - maturin --help +outputs: + - name: {{ name }} + script: bld-win.bat # [win] + script: build-unix.sh # [not win] + missing_dso_whitelist: # [osx] + - /usr/lib/libresolv.9.dylib # [osx] + requirements: + host: + - pip + - python + - setuptools + - setuptools-rust >=1.4.0 + - wheel >=0.36.2 + - tomli >=1.1.0 + run: + - python + - tomli >=1.1.0 + build: + - {{ compiler('c') }} + - {{ compiler('rust') }} # [not win] + - rust_win-64 # [win] + test: + commands: + - maturin --help + - name: {{ name }}-gnu # [win] + script: bld-win.bat # [win] + requirements: # [win] + host: # [win] + - pip # [win] + - python # [win] + - setuptools # [win] + - setuptools-rust >=1.4.0 # [win] + - wheel >=0.36.2 # [win] + - tomli >=1.1.0 # [win] + run: # [win] + - python # [win] + - tomli >=1.1.0 # [win] + build: # [win] + - {{ compiler('m2w64_c') }} # [win] + - rust-gnu_win-64 # [win] + test: # [win] + requires: # [win] + - posix # [win] + commands: # [win] + - maturin --help # [win] about: home: https://maturin.rs/ From f1c419ac795920331e795df1d086657fcf5bd3c5 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 6 Oct 2022 13:49:42 -0700 Subject: [PATCH 14/28] Remove posix from test requirements --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bd258b8..d7ff9f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -57,8 +57,6 @@ outputs: - {{ compiler('m2w64_c') }} # [win] - rust-gnu_win-64 # [win] test: # [win] - requires: # [win] - - posix # [win] commands: # [win] - maturin --help # [win] From 5a92182e7d7b536c562d8af6c4d724e439cc9942 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 6 Oct 2022 14:35:42 -0700 Subject: [PATCH 15/28] Increase build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d7ff9f0..7d27382 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: edeb8ecaa5cc6e6d2f50a32289798d7ca046c33481ac24f74805ff289af6afe4 build: - number: 0 + number: 1 # ring (dependency loaded via cargo) is not supported on s390x yet # https://github.com/briansmith/ring/issues/1511 skip: True # [py<37 or s390x] From a7c89ce20f1b372e358b096e8317149e8fd758e2 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Thu, 6 Oct 2022 14:43:35 -0700 Subject: [PATCH 16/28] Reset build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7d27382..d7ff9f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: edeb8ecaa5cc6e6d2f50a32289798d7ca046c33481ac24f74805ff289af6afe4 build: - number: 1 + number: 0 # ring (dependency loaded via cargo) is not supported on s390x yet # https://github.com/briansmith/ring/issues/1511 skip: True # [py<37 or s390x] From daaa938847944e565abccf2a65c7c58a4fc9e540 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Wed, 26 Oct 2022 11:46:59 -0700 Subject: [PATCH 17/28] Update rust compiler version --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 465d7f0..23983d3 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,2 @@ rust_compiler_version: - - 1.63.0 + - 1.64.0 From 5dc5a8446de1d93d42242bd1f0e377f137dff805 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Fri, 28 Oct 2022 14:50:41 -0700 Subject: [PATCH 18/28] Update to v0.13.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d7ff9f0..76ba163 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "maturin" %} -{% set version = "0.13.3" %} +{% set version = "0.13.6" %} package: name: {{ name }}-suite @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: edeb8ecaa5cc6e6d2f50a32289798d7ca046c33481ac24f74805ff289af6afe4 + sha256: df649c77dc9da2182322764fdaa265ef4e2fd74c87d9022e3463e130e5d2c536 build: number: 0 From f7ee2b14d3a4f8f0b6497bccd43e391c5d3fe791 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Nov 2022 14:29:24 -0700 Subject: [PATCH 19/28] Add pip check --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 76ba163..59934a1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,6 +40,7 @@ outputs: test: commands: - maturin --help + - pip check - name: {{ name }}-gnu # [win] script: bld-win.bat # [win] requirements: # [win] @@ -59,6 +60,7 @@ outputs: test: # [win] commands: # [win] - maturin --help # [win] + - pip check # [win] about: home: https://maturin.rs/ From 9adcc321eb310525090a3fa3246d2f804931122b Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Nov 2022 14:31:28 -0700 Subject: [PATCH 20/28] Update about --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 59934a1..4ea77f5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,8 +69,12 @@ about: license_file: license-mit summary: >- Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages + description: | + This project is meant as a zero configuration replacement for setuptools-rust and milksnake. + It supports building wheels for python 3.5+ on windows, linux, mac and freebsd, can upload them to pypi and has basic pypy support. dev_url: https://github.com/PyO3/maturin doc_url: https://maturin.rs/ + doc_source_url: https://github.com/PyO3/maturin/tree/v{{ version }}/guide/src extra: recipe-maintainers: From 18ea7a90e80cfba584049bd86ac34bfe6ac50ae3 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Nov 2022 14:36:50 -0700 Subject: [PATCH 21/28] Update to v0.13.7 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4ea77f5..5fbc868 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "maturin" %} -{% set version = "0.13.6" %} +{% set version = "0.13.7" %} package: name: {{ name }}-suite @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: df649c77dc9da2182322764fdaa265ef4e2fd74c87d9022e3463e130e5d2c536 + sha256: 8a30a01efc35f301a97e18718631d406144a8cddb91a7ba4485b0f45e8e27af0 build: number: 0 From 7ea7dd34f5b5ffb418fe95ad797ec7f2fa3f1598 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Nov 2022 14:39:15 -0700 Subject: [PATCH 22/28] Update checksum --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5fbc868..14824c7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 8a30a01efc35f301a97e18718631d406144a8cddb91a7ba4485b0f45e8e27af0 + sha256: c0a77aa0c57f945649ca711c806203a1b6888ad49c2b8b85196ffdcf0421db77 build: number: 0 From 4a5dc34a737ec2836c6bd2ac165f22edac5e38d1 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Nov 2022 15:39:00 -0700 Subject: [PATCH 23/28] Add pip to test requirements --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 14824c7..73fa489 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,8 @@ outputs: - {{ compiler('rust') }} # [not win] - rust_win-64 # [win] test: + requires: + - pip commands: - maturin --help - pip check @@ -58,6 +60,8 @@ outputs: - {{ compiler('m2w64_c') }} # [win] - rust-gnu_win-64 # [win] test: # [win] + requires: # [win] + - pip # [win] commands: # [win] - maturin --help # [win] - pip check # [win] From bfe5dd8bee5f08cd8954ef792bd32e38fe40fa0b Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Wed, 2 Nov 2022 07:44:35 -0700 Subject: [PATCH 24/28] Add additional tests --- recipe/meta.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73fa489..2189ac5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,10 +38,14 @@ outputs: - {{ compiler('rust') }} # [not win] - rust_win-64 # [win] test: + imports: + - maturin requires: - pip commands: + - maturin -V - maturin --help + - maturin build --help - pip check - name: {{ name }}-gnu # [win] script: bld-win.bat # [win] @@ -60,10 +64,14 @@ outputs: - {{ compiler('m2w64_c') }} # [win] - rust-gnu_win-64 # [win] test: # [win] + imports: # [win] + - maturin # [win] requires: # [win] - pip # [win] commands: # [win] + - maturin -V # [win] - maturin --help # [win] + - maturin build --help # [win] - pip check # [win] about: From 6c57b8b018eb4ad1fe9452d12f4b19eb07d2fc89 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Wed, 2 Nov 2022 08:04:42 -0700 Subject: [PATCH 25/28] Update python pinnings --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2189ac5..8f56c47 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ build: number: 0 # ring (dependency loaded via cargo) is not supported on s390x yet # https://github.com/briansmith/ring/issues/1511 - skip: True # [py<37 or s390x] + skip: True # [py<37 or s390x or py>310] outputs: From 88b19c5a216c96debb887592f892ee02ad135ba8 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Wed, 2 Nov 2022 08:05:10 -0700 Subject: [PATCH 26/28] Move build sections --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f56c47..4408901 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,10 @@ outputs: missing_dso_whitelist: # [osx] - /usr/lib/libresolv.9.dylib # [osx] requirements: + build: + - {{ compiler('c') }} + - {{ compiler('rust') }} # [not win] + - rust_win-64 # [win] host: - pip - python @@ -33,10 +37,6 @@ outputs: run: - python - tomli >=1.1.0 - build: - - {{ compiler('c') }} - - {{ compiler('rust') }} # [not win] - - rust_win-64 # [win] test: imports: - maturin @@ -50,6 +50,9 @@ outputs: - name: {{ name }}-gnu # [win] script: bld-win.bat # [win] requirements: # [win] + build: # [win] + - {{ compiler('m2w64_c') }} # [win] + - rust-gnu_win-64 # [win] host: # [win] - pip # [win] - python # [win] @@ -60,9 +63,6 @@ outputs: run: # [win] - python # [win] - tomli >=1.1.0 # [win] - build: # [win] - - {{ compiler('m2w64_c') }} # [win] - - rust-gnu_win-64 # [win] test: # [win] imports: # [win] - maturin # [win] From 2cabd40546331e8b2b5c93f61c3011863525fb59 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Wed, 2 Nov 2022 08:12:53 -0700 Subject: [PATCH 27/28] Change license logic --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4408901..2c88378 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,7 +76,7 @@ outputs: about: home: https://maturin.rs/ - license: MIT and Apache-2.0 + license: MIT OR Apache-2.0 license_family: MIT license_file: license-mit summary: >- From dd6692ecac67a0550c2935e453e0142afa489d7c Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 8 Nov 2022 16:52:10 -0800 Subject: [PATCH 28/28] Remove abs.yaml --- abs.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 abs.yaml diff --git a/abs.yaml b/abs.yaml deleted file mode 100644 index a722356..0000000 --- a/abs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -channels: - - anaconda-server -build_parameters: - - "--suppress-variables" - - "--error-overlinking" - - "--error-overdepending"