From d90b5e5f43f0ceed18d6dae1b4b029ac4a4be87a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 21 Mar 2022 15:10:04 +1100 Subject: [PATCH 01/10] fix cross-compilation issues --- recipe/meta.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca7ab9a..876ddce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,14 @@ build: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] script: - - export PYO3_CROSS_LIB_DIR={{ PREFIX }}/lib # [arm64] + {% if build_platform != target_platform %} + - export PYO3_CROSS_INCLUDE_DIR=$PREFIX/include + - export PYO3_CROSS_LIB_DIR=$SP_DIR/../ + - export PYO3_CROSS_PYTHON_VERSION=$PY_VER + # see below for what OPENSSL_DIR should be pointing to: + # https://github.com/sfackler/rust-openssl/blob/openssl-sys-v0.9.72/openssl/src/lib.rs#L55-L56 + - export OPENSSL_DIR=$PREFIX + {% endif %} - find {{ PREFIX }}/lib/python3.* -name "_sysconfigdata_*.py" -type f -not -name "_sysconfigdata_arm64_*.py" -delete # [arm64] - {{ PYTHON }} -m pip install . -vv @@ -23,6 +30,7 @@ requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] + - openssl # [build_platform != target_platform] - {{ compiler('cxx') }} - {{ compiler('rust') }} host: From edae3d2875ddadae6893be3e8d9c571ab747aaac Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 21 Mar 2022 18:11:54 +1100 Subject: [PATCH 02/10] switch to github sources (to enable running test suite) --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 876ddce..b1d6a22 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,15 @@ -{% set name = "tokenizers" %} {% set version = "0.13.1" %} package: - name: {{ name|lower }} + name: tokenizers version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 3333d1cee5c8f47c96362ea0abc1f81c77c9b92c6c3d11cbf1d01985f0d5cf1d + url: https://github.com/huggingface/tokenizers/archive/refs/tags/python-v{{ version }}.tar.gz + sha256: 41cff8c8c87ba6dfbd9eb1d89b006aabb9c9823ffd09e281d6ddfb9ae695bd1a build: - number: 0 + number: 1 missing_dso_whitelist: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] From a8e1856b9d693c6ba42237ecb21386ab24d85b34 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 21 Mar 2022 19:29:49 +1100 Subject: [PATCH 03/10] run upstream test suite needs data downloads & extra requirements, see https://github.com/huggingface/tokenizers/blob/python-v0.13.1/bindings/python/setup.py#L5 --- recipe/meta.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b1d6a22..4a8f6ab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ build: - export OPENSSL_DIR=$PREFIX {% endif %} - find {{ PREFIX }}/lib/python3.* -name "_sysconfigdata_*.py" -type f -not -name "_sysconfigdata_arm64_*.py" -delete # [arm64] + - cd bindings/python - {{ PYTHON }} -m pip install . -vv requirements: @@ -51,10 +52,23 @@ test: - tokenizers.processors - tokenizers.trainers - tokenizers.implementations - commands: - - pip check requires: - pip + - pytest + - datasets + - numpy * + - requests + - curl * + source_files: + - bindings/python/tests + commands: + - pip check + # upstream requires running the tests from this directory + - cd bindings/python + # adapted from https://github.com/huggingface/tokenizers/blob/master/bindings/python/Makefile + - mkdir data + - curl https://norvig.com/big.txt > data/big.txt + - pytest tests about: home: https://pypi.org/project/tokenizers/ From 1904a570b0dafaae688545cd3d59ed54b9bf9050 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 21 Mar 2022 19:30:59 +1100 Subject: [PATCH 04/10] add myself to maintainers --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4a8f6ab..7ce79f6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -84,3 +84,4 @@ extra: - ndmaxar - oblute - setu4993 + - h-vetinari From ed4c09d4ec7adf8b0535117b6915ddb606d56045 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 21 Mar 2022 22:10:48 +1100 Subject: [PATCH 05/10] skip parallel tests on windows --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7ce79f6..07ab7f9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -68,7 +68,10 @@ test: # adapted from https://github.com/huggingface/tokenizers/blob/master/bindings/python/Makefile - mkdir data - curl https://norvig.com/big.txt > data/big.txt - - pytest tests + {% set tests_to_skip = "_not_a_real_test" %} + # windows and expectation of forking -> not gonna happen + {% set tests_to_skip = tests_to_skip + " or with_parallelism" %} # [win] + - pytest -v tests -k "not ({{ tests_to_skip }})" about: home: https://pypi.org/project/tokenizers/ From 9c847098360cad9ad5b5b4a35e1a45e66033700b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 12 Sep 2022 14:34:09 +0200 Subject: [PATCH 06/10] skip openssl 3 for now --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 07ab7f9..365daaf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,8 @@ source: build: number: 1 + # no support for openssl 3 yet + skip: true # [openssl != "1.1.1"] missing_dso_whitelist: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] From 402c0888b76ce37ab54180b8d9d257501b67b294 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 12 Sep 2022 14:41:26 +0200 Subject: [PATCH 07/10] don't fork on windows --- recipe/meta.yaml | 2 ++ .../patches/0001-don-t-fork-on-windows.patch | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 recipe/patches/0001-don-t-fork-on-windows.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 365daaf..1423fcf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,6 +7,8 @@ package: source: url: https://github.com/huggingface/tokenizers/archive/refs/tags/python-v{{ version }}.tar.gz sha256: 41cff8c8c87ba6dfbd9eb1d89b006aabb9c9823ffd09e281d6ddfb9ae695bd1a + patches: + - patches/0001-don-t-fork-on-windows.patch # [win] build: number: 1 diff --git a/recipe/patches/0001-don-t-fork-on-windows.patch b/recipe/patches/0001-don-t-fork-on-windows.patch new file mode 100644 index 0000000..a01fc0f --- /dev/null +++ b/recipe/patches/0001-don-t-fork-on-windows.patch @@ -0,0 +1,27 @@ +From 6104215e37af690aad6dd34157024a95c0c6e919 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Mon, 12 Sep 2022 14:40:37 +0200 +Subject: [PATCH] don't fork on windows + +--- + bindings/python/tests/utils.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/bindings/python/tests/utils.py b/bindings/python/tests/utils.py +index b2b028d..02bfb5b 100644 +--- a/bindings/python/tests/utils.py ++++ b/bindings/python/tests/utils.py +@@ -98,10 +98,6 @@ def doc_pipeline_bert_tokenizer(data_dir): + ) + + +-# On MacOS Python 3.8+ the default was modified to `spawn`, we need `fork` in tests. +-mp.set_start_method("fork") +- +- + def multiprocessing_with_parallelism(tokenizer, enabled: bool): + """ + This helper can be used to test that disabling parallelism avoids dead locks when the +-- +2.38.1.windows.1 + From eed4aaa690cfcbbea0904b29033cfefe2c0d0a3f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 24 Oct 2022 12:06:29 +1100 Subject: [PATCH 08/10] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.23.10.16.33 --- .azure-pipelines/azure-pipelines-linux.yml | 16 --- .azure-pipelines/azure-pipelines-osx.yml | 28 ++-- .azure-pipelines/azure-pipelines-win.yml | 16 +-- ...nux_64_openssl3python3.10.____cpython.yaml | 24 ---- ...inux_64_openssl3python3.7.____cpython.yaml | 24 ---- ...inux_64_openssl3python3.8.____cpython.yaml | 24 ---- ...inux_64_openssl3python3.9.____cpython.yaml | 24 ---- ...arch64_openssl3python3.10.____cpython.yaml | 28 ---- ...aarch64_openssl3python3.7.____cpython.yaml | 28 ---- ...aarch64_openssl3python3.8.____cpython.yaml | 28 ---- ...aarch64_openssl3python3.9.____cpython.yaml | 28 ---- ...pc64le_openssl3python3.10.____cpython.yaml | 24 ---- ...ppc64le_openssl3python3.7.____cpython.yaml | 24 ---- ...ppc64le_openssl3python3.8.____cpython.yaml | 24 ---- ...ppc64le_openssl3python3.9.____cpython.yaml | 24 ---- ...4_openssl1.1.1python3.10.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.7.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.8.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.9.____cpython.yaml} | 2 + ...4_openssl1.1.1python3.10.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.8.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.9.____cpython.yaml} | 2 + ...4_openssl1.1.1python3.10.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.7.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.8.____cpython.yaml} | 2 + ...64_openssl1.1.1python3.9.____cpython.yaml} | 2 + .github/CODEOWNERS | 2 +- .travis.yml | 40 ------ README.md | 129 ++++-------------- 29 files changed, 68 insertions(+), 489 deletions(-) delete mode 100644 .ci_support/linux_64_openssl3python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_openssl3python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_64_openssl3python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_openssl3python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_openssl3python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_openssl3python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_openssl3python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_openssl3python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_openssl3python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_openssl3python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_openssl3python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_openssl3python3.9.____cpython.yaml rename .ci_support/{osx_64_python3.10.____cpython.yaml => osx_64_openssl1.1.1python3.10.____cpython.yaml} (95%) rename .ci_support/{osx_64_python3.7.____cpython.yaml => osx_64_openssl1.1.1python3.7.____cpython.yaml} (95%) rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_openssl1.1.1python3.8.____cpython.yaml} (95%) rename .ci_support/{osx_64_python3.9.____cpython.yaml => osx_64_openssl1.1.1python3.9.____cpython.yaml} (95%) rename .ci_support/{osx_arm64_python3.10.____cpython.yaml => osx_arm64_openssl1.1.1python3.10.____cpython.yaml} (95%) rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_openssl1.1.1python3.8.____cpython.yaml} (95%) rename .ci_support/{osx_arm64_python3.9.____cpython.yaml => osx_arm64_openssl1.1.1python3.9.____cpython.yaml} (95%) rename .ci_support/{win_64_python3.10.____cpython.yaml => win_64_openssl1.1.1python3.10.____cpython.yaml} (93%) rename .ci_support/{win_64_python3.7.____cpython.yaml => win_64_openssl1.1.1python3.7.____cpython.yaml} (93%) rename .ci_support/{win_64_python3.8.____cpython.yaml => win_64_openssl1.1.1python3.8.____cpython.yaml} (93%) rename .ci_support/{win_64_python3.9.____cpython.yaml => win_64_openssl1.1.1python3.9.____cpython.yaml} (93%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ce10e95..77047b6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,22 +24,6 @@ jobs: CONFIG: linux_64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_openssl3python3.10.____cpython: - CONFIG: linux_64_openssl3python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_openssl3python3.7.____cpython: - CONFIG: linux_64_openssl3python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_openssl3python3.8.____cpython: - CONFIG: linux_64_openssl3python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_openssl3python3.9.____cpython: - CONFIG: linux_64_openssl3python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f5a3e05..545c391 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,26 +8,26 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_openssl1.1.1python3.10.____cpython: + CONFIG: osx_64_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython + osx_64_openssl1.1.1python3.7.____cpython: + CONFIG: osx_64_openssl1.1.1python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_openssl1.1.1python3.8.____cpython: + CONFIG: osx_64_openssl1.1.1python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_openssl1.1.1python3.9.____cpython: + CONFIG: osx_64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_arm64_openssl1.1.1python3.10.____cpython: + CONFIG: osx_arm64_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_openssl1.1.1python3.8.____cpython: + CONFIG: osx_arm64_openssl1.1.1python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_arm64_openssl1.1.1python3.9.____cpython: + CONFIG: osx_arm64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ac38000..7f905d2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,17 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_openssl1.1.1python3.10.____cpython: + CONFIG: win_64_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.7.____cpython: - CONFIG: win_64_python3.7.____cpython + win_64_openssl1.1.1python3.7.____cpython: + CONFIG: win_64_openssl1.1.1python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython + win_64_openssl1.1.1python3.8.____cpython: + CONFIG: win_64_openssl1.1.1python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_openssl1.1.1python3.9.____cpython: + CONFIG: win_64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_openssl3python3.10.____cpython.yaml b/.ci_support/linux_64_openssl3python3.10.____cpython.yaml deleted file mode 100644 index 86a9734..0000000 --- a/.ci_support/linux_64_openssl3python3.10.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_openssl3python3.7.____cpython.yaml b/.ci_support/linux_64_openssl3python3.7.____cpython.yaml deleted file mode 100644 index 7cfe7ae..0000000 --- a/.ci_support/linux_64_openssl3python3.7.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_openssl3python3.8.____cpython.yaml b/.ci_support/linux_64_openssl3python3.8.____cpython.yaml deleted file mode 100644 index 8decb84..0000000 --- a/.ci_support/linux_64_openssl3python3.8.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_openssl3python3.9.____cpython.yaml b/.ci_support/linux_64_openssl3python3.9.____cpython.yaml deleted file mode 100644 index ba84bda..0000000 --- a/.ci_support/linux_64_openssl3python3.9.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-64 diff --git a/.ci_support/linux_aarch64_openssl3python3.10.____cpython.yaml b/.ci_support/linux_aarch64_openssl3python3.10.____cpython.yaml deleted file mode 100644 index 4a1cfc6..0000000 --- a/.ci_support/linux_aarch64_openssl3python3.10.____cpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_openssl3python3.7.____cpython.yaml b/.ci_support/linux_aarch64_openssl3python3.7.____cpython.yaml deleted file mode 100644 index f125ba1..0000000 --- a/.ci_support/linux_aarch64_openssl3python3.7.____cpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_openssl3python3.8.____cpython.yaml b/.ci_support/linux_aarch64_openssl3python3.8.____cpython.yaml deleted file mode 100644 index b97aced..0000000 --- a/.ci_support/linux_aarch64_openssl3python3.8.____cpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_openssl3python3.9.____cpython.yaml b/.ci_support/linux_aarch64_openssl3python3.9.____cpython.yaml deleted file mode 100644 index 093b01b..0000000 --- a/.ci_support/linux_aarch64_openssl3python3.9.____cpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_ppc64le_openssl3python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_openssl3python3.10.____cpython.yaml deleted file mode 100644 index 0a8e3a8..0000000 --- a/.ci_support/linux_ppc64le_openssl3python3.10.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -openssl: -- '3' -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_openssl3python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_openssl3python3.7.____cpython.yaml deleted file mode 100644 index c44e72f..0000000 --- a/.ci_support/linux_ppc64le_openssl3python3.7.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_openssl3python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_openssl3python3.8.____cpython.yaml deleted file mode 100644 index ff4da9b..0000000 --- a/.ci_support/linux_ppc64le_openssl3python3.8.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -openssl: -- '3' -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_openssl3python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_openssl3python3.9.____cpython.yaml deleted file mode 100644 index 84ce09f..0000000 --- a/.ci_support/linux_ppc64le_openssl3python3.9.____cpython.yaml +++ /dev/null @@ -1,24 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -openssl: -- '3' -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_openssl1.1.1python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_openssl1.1.1python3.10.____cpython.yaml index 15e44b1..d1cedea 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_openssl1.1.1python3.10.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - x86_64-apple-darwin13.4.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_openssl1.1.1python3.7.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_python3.7.____cpython.yaml rename to .ci_support/osx_64_openssl1.1.1python3.7.____cpython.yaml index 2b6da3a..fa8a432 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_openssl1.1.1python3.7.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - x86_64-apple-darwin13.4.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_openssl1.1.1python3.8.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_openssl1.1.1python3.8.____cpython.yaml index 9b80e0a..98cce53 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_openssl1.1.1python3.8.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - x86_64-apple-darwin13.4.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_openssl1.1.1python3.9.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_openssl1.1.1python3.9.____cpython.yaml index 1fd2492..ecb9a1c 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_openssl1.1.1python3.9.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - x86_64-apple-darwin13.4.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_openssl1.1.1python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_openssl1.1.1python3.10.____cpython.yaml index a7c6627..e1bec14 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1python3.10.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - arm64-apple-darwin20.0.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_openssl1.1.1python3.8.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_openssl1.1.1python3.8.____cpython.yaml index 48fd483..cc9a86c 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1python3.8.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - arm64-apple-darwin20.0.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_openssl1.1.1python3.9.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_openssl1.1.1python3.9.____cpython.yaml index d5f14d1..2fa39c4 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1python3.9.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '14' macos_machine: - arm64-apple-darwin20.0.0 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_openssl1.1.1python3.10.____cpython.yaml similarity index 93% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_openssl1.1.1python3.10.____cpython.yaml index f3e04f7..eb01d26 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_openssl1.1.1python3.10.____cpython.yaml @@ -4,6 +4,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_openssl1.1.1python3.7.____cpython.yaml similarity index 93% rename from .ci_support/win_64_python3.7.____cpython.yaml rename to .ci_support/win_64_openssl1.1.1python3.7.____cpython.yaml index 79c2dc9..6581df9 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/win_64_openssl1.1.1python3.7.____cpython.yaml @@ -4,6 +4,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_openssl1.1.1python3.8.____cpython.yaml similarity index 93% rename from .ci_support/win_64_python3.8.____cpython.yaml rename to .ci_support/win_64_openssl1.1.1python3.8.____cpython.yaml index 51bbec9..5a09703 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_openssl1.1.1python3.8.____cpython.yaml @@ -4,6 +4,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_openssl1.1.1python3.9.____cpython.yaml similarity index 93% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_openssl1.1.1python3.9.____cpython.yaml index 7dfbac6..1dc7722 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_openssl1.1.1python3.9.____cpython.yaml @@ -4,6 +4,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +openssl: +- 1.1.1 pin_run_as_build: python: min_pin: x.x diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7bac834..5eb1eb1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @anthchirp @ndmaxar @oblute @setu4993 \ No newline at end of file +* @anthchirp @h-vetinari @ndmaxar @oblute @setu4993 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b4b1314..d47c78c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,26 +27,6 @@ matrix: arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_openssl3python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl3python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl3python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl3python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - env: CONFIG=linux_ppc64le_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le @@ -67,26 +47,6 @@ matrix: arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_openssl3python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl3python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl3python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl3python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - script: - export CI=travis - export GIT_BRANCH="$TRAVIS_BRANCH" diff --git a/README.md b/README.md index 2824e59..7b45037 100644 --- a/README.md +++ b/README.md @@ -63,34 +63,6 @@ Current build status variant - - linux_64_openssl3python3.10.____cpython - - - variant - - - - linux_64_openssl3python3.7.____cpython - - - variant - - - - linux_64_openssl3python3.8.____cpython - - - variant - - - - linux_64_openssl3python3.9.____cpython - - - variant - - linux_aarch64_openssl1.1.1python3.10.____cpython @@ -119,34 +91,6 @@ Current build status variant - - linux_aarch64_openssl3python3.10.____cpython - - - variant - - - - linux_aarch64_openssl3python3.7.____cpython - - - variant - - - - linux_aarch64_openssl3python3.8.____cpython - - - variant - - - - linux_aarch64_openssl3python3.9.____cpython - - - variant - - linux_ppc64le_openssl1.1.1python3.10.____cpython @@ -176,108 +120,80 @@ Current build status - linux_ppc64le_openssl3python3.10.____cpython - - - variant - - - - linux_ppc64le_openssl3python3.7.____cpython - - - variant - - - - linux_ppc64le_openssl3python3.8.____cpython - - - variant - - - - linux_ppc64le_openssl3python3.9.____cpython - - - variant - - - - osx_64_python3.10.____cpython + osx_64_openssl1.1.1python3.10.____cpython - variant + variant - osx_64_python3.7.____cpython + osx_64_openssl1.1.1python3.7.____cpython - variant + variant - osx_64_python3.8.____cpython + osx_64_openssl1.1.1python3.8.____cpython - variant + variant - osx_64_python3.9.____cpython + osx_64_openssl1.1.1python3.9.____cpython - variant + variant - osx_arm64_python3.10.____cpython + osx_arm64_openssl1.1.1python3.10.____cpython - variant + variant - osx_arm64_python3.8.____cpython + osx_arm64_openssl1.1.1python3.8.____cpython - variant + variant - osx_arm64_python3.9.____cpython + osx_arm64_openssl1.1.1python3.9.____cpython - variant + variant - win_64_python3.10.____cpython + win_64_openssl1.1.1python3.10.____cpython - variant + variant - win_64_python3.7.____cpython + win_64_openssl1.1.1python3.7.____cpython - variant + variant - win_64_python3.8.____cpython + win_64_openssl1.1.1python3.8.____cpython - variant + variant - win_64_python3.9.____cpython + win_64_openssl1.1.1python3.9.____cpython - variant + variant @@ -410,6 +326,7 @@ Feedstock Maintainers ===================== * [@anthchirp](https://github.com/anthchirp/) +* [@h-vetinari](https://github.com/h-vetinari/) * [@ndmaxar](https://github.com/ndmaxar/) * [@oblute](https://github.com/oblute/) * [@setu4993](https://github.com/setu4993/) From f75825a7db3bb23f1766b12591b695e6d3f75e6d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 24 Oct 2022 14:58:43 +1100 Subject: [PATCH 09/10] cross-compile aarch64/ppc64le --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index ba16182..69c1e8d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,7 @@ build_platform: osx_arm64: osx_64 + linux_ppc64le: linux_64 + linux_aarch64: linux_64 conda_forge_output_validation: true provider: linux_aarch64: default From 1bf282ab989fd57354fde112a683990064f58574 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 24 Oct 2022 15:11:24 +1100 Subject: [PATCH 10/10] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.24.01.16.58 --- .azure-pipelines/azure-pipelines-linux.yml | 32 +++++++++++ ...64_openssl1.1.1python3.10.____cpython.yaml | 2 +- ...h64_openssl1.1.1python3.7.____cpython.yaml | 2 +- ...h64_openssl1.1.1python3.8.____cpython.yaml | 2 +- ...h64_openssl1.1.1python3.9.____cpython.yaml | 2 +- ...le_openssl1.1.1python3.10.____cpython.yaml | 2 +- ...4le_openssl1.1.1python3.7.____cpython.yaml | 2 +- ...4le_openssl1.1.1python3.8.____cpython.yaml | 2 +- ...4le_openssl1.1.1python3.9.____cpython.yaml | 2 +- .travis.yml | 57 ------------------- README.md | 9 +-- 11 files changed, 41 insertions(+), 73 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 77047b6..2d9001f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,6 +24,38 @@ jobs: CONFIG: linux_64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_openssl1.1.1python3.10.____cpython: + CONFIG: linux_aarch64_openssl1.1.1python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_openssl1.1.1python3.7.____cpython: + CONFIG: linux_aarch64_openssl1.1.1python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_openssl1.1.1python3.8.____cpython: + CONFIG: linux_aarch64_openssl1.1.1python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_openssl1.1.1python3.9.____cpython: + CONFIG: linux_aarch64_openssl1.1.1python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_openssl1.1.1python3.10.____cpython: + CONFIG: linux_ppc64le_openssl1.1.1python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_openssl1.1.1python3.7.____cpython: + CONFIG: linux_ppc64le_openssl1.1.1python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_openssl1.1.1python3.8.____cpython: + CONFIG: linux_ppc64le_openssl1.1.1python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_openssl1.1.1python3.9.____cpython: + CONFIG: linux_ppc64le_openssl1.1.1python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_openssl1.1.1python3.10.____cpython.yaml b/.ci_support/linux_aarch64_openssl1.1.1python3.10.____cpython.yaml index 31ccd31..c3f5203 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_openssl1.1.1python3.7.____cpython.yaml b/.ci_support/linux_aarch64_openssl1.1.1python3.7.____cpython.yaml index 8cfe61d..6a285b1 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1python3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_openssl1.1.1python3.8.____cpython.yaml b/.ci_support/linux_aarch64_openssl1.1.1python3.8.____cpython.yaml index 8228b96..212d379 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_openssl1.1.1python3.9.____cpython.yaml b/.ci_support/linux_aarch64_openssl1.1.1python3.9.____cpython.yaml index 75557a0..b3067fe 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_openssl1.1.1python3.10.____cpython.yaml index 3d555c6..ffc0361 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_openssl1.1.1python3.7.____cpython.yaml index 6c35d4b..f36be74 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1python3.7.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_openssl1.1.1python3.8.____cpython.yaml index 37a7f3d..20981d8 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_openssl1.1.1python3.9.____cpython.yaml index 0c8feed..91e4300 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 openssl: - 1.1.1 pin_run_as_build: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d47c78c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_aarch64_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl1.1.1python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl1.1.1python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_ppc64le_openssl1.1.1python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl1.1.1python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl1.1.1python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl1.1.1python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 7b45037..e160ae9 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
Azure