From f536a0435b6b8838b0952fb1e9e240bdba4193f9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:40:44 +0000 Subject: [PATCH 1/7] Rebuild for python 3.13 --- .ci_support/migrations/python313.yaml | 44 +++++++++++++++++++++++++++ recipe/meta.yaml | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python313.yaml diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 0000000..92cc90b --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,44 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 274e59e..54810f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,11 +12,12 @@ source: - do-not-build-scintilla.patch build: - number: 2 + number: 3 requirements: build: - {{ compiler("c") }} # [win and python_impl != 'pypy'] + - {{ stdlib("c") }} # [win and python_impl != 'pypy'] - {{ compiler("cxx") }} # [win and python_impl != 'pypy'] host: - python From 55c0703bfce870ce1d53b0bf388d7380fad6fbc5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:41:41 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.28.19.57.49 --- .azure-pipelines/azure-pipelines-linux.yml | 76 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 33 ++-- .azure-pipelines/azure-pipelines-win.yml | 28 ++-- ...l => linux_64_python3.10.____cpython.yaml} | 2 +- ...l => linux_64_python3.11.____cpython.yaml} | 2 +- ...l => linux_64_python3.12.____cpython.yaml} | 4 +- ...aml => linux_64_python3.13.____cp313.yaml} | 4 +- ..._python3.9.____73_pypypython_implpypy.yaml | 22 --- ...ml => linux_64_python3.9.____cpython.yaml} | 2 +- ...linux_aarch64_python3.10.____cpython.yaml} | 0 ...linux_aarch64_python3.11.____cpython.yaml} | 0 ...linux_aarch64_python3.12.____cpython.yaml} | 2 +- ...> linux_aarch64_python3.13.____cp313.yaml} | 2 +- ..._python3.9.____73_pypypython_implpypy.yaml | 26 ---- ... linux_aarch64_python3.9.____cpython.yaml} | 0 ...linux_ppc64le_python3.10.____cpython.yaml} | 0 ...linux_ppc64le_python3.11.____cpython.yaml} | 0 ...linux_ppc64le_python3.12.____cpython.yaml} | 2 +- ...> linux_ppc64le_python3.13.____cp313.yaml} | 2 +- ..._python3.9.____73_pypypython_implpypy.yaml | 22 --- ... linux_ppc64le_python3.9.____cpython.yaml} | 0 .ci_support/migrations/pypy38.yaml | 43 ------ ...aml => osx_64_python3.10.____cpython.yaml} | 4 +- ...aml => osx_64_python3.11.____cpython.yaml} | 4 +- ...aml => osx_64_python3.12.____cpython.yaml} | 6 +- ....yaml => osx_64_python3.13.____cp313.yaml} | 6 +- ..._python3.9.____73_pypypython_implpypy.yaml | 22 --- ...yaml => osx_64_python3.9.____cpython.yaml} | 4 +- .../osx_arm64_python3.10.____cpython.yaml | 2 + .../osx_arm64_python3.11.____cpython.yaml | 2 + .../osx_arm64_python3.12.____cpython.yaml | 4 +- ...ml => osx_arm64_python3.13.____cp313.yaml} | 6 +- .../osx_arm64_python3.9.____cpython.yaml | 2 + ...aml => win_64_python3.10.____cpython.yaml} | 2 + ...aml => win_64_python3.11.____cpython.yaml} | 2 + ...aml => win_64_python3.12.____cpython.yaml} | 4 +- ....yaml => win_64_python3.13.____cp313.yaml} | 4 +- ..._python3.9.____73_pypypython_implpypy.yaml | 22 --- ...yaml => win_64_python3.9.____cpython.yaml} | 2 + .gitattributes | 4 +- .gitignore | 25 +++- .scripts/build_steps.sh | 17 ++- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 24 ++- .scripts/run_win_build.bat | 21 ++- README.md | 141 +++++++----------- azure-pipelines.yml | 4 +- build-locally.py | 9 +- 48 files changed, 262 insertions(+), 362 deletions(-) rename .ci_support/{linux_64_python3.10.____cpythonpython_implcpython.yaml => linux_64_python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_64_python3.11.____cpythonpython_implcpython.yaml => linux_64_python3.11.____cpython.yaml} (97%) rename .ci_support/{linux_64_python3.8.____cpythonpython_implcpython.yaml => linux_64_python3.12.____cpython.yaml} (92%) rename .ci_support/{linux_64_python3.12.____cpythonpython_implcpython.yaml => linux_64_python3.13.____cp313.yaml} (92%) delete mode 100644 .ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_64_python3.9.____cpythonpython_implcpython.yaml => linux_64_python3.9.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_python3.10.____cpythonpython_implcpython.yaml => linux_aarch64_python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_aarch64_python3.11.____cpythonpython_implcpython.yaml => linux_aarch64_python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_aarch64_python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_python3.12.____cpython.yaml} (95%) rename .ci_support/{linux_aarch64_python3.12.____cpythonpython_implcpython.yaml => linux_aarch64_python3.13.____cp313.yaml} (95%) delete mode 100644 .ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_aarch64_python3.9.____cpythonpython_implcpython.yaml => linux_aarch64_python3.9.____cpython.yaml} (100%) rename .ci_support/{linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.12.____cpython.yaml} (94%) rename .ci_support/{linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.13.____cp313.yaml} (94%) delete mode 100644 .ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.9.____cpython.yaml} (100%) delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_python3.10.____cpythonpython_implcpython.yaml => osx_64_python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_64_python3.11.____cpythonpython_implcpython.yaml => osx_64_python3.11.____cpython.yaml} (89%) rename .ci_support/{osx_64_python3.8.____cpythonpython_implcpython.yaml => osx_64_python3.12.____cpython.yaml} (84%) rename .ci_support/{osx_64_python3.12.____cpythonpython_implcpython.yaml => osx_64_python3.13.____cp313.yaml} (85%) delete mode 100644 .ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{osx_64_python3.9.____cpythonpython_implcpython.yaml => osx_64_python3.9.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_python3.13.____cp313.yaml} (77%) rename .ci_support/{win_64_python3.10.____cpythonpython_implcpython.yaml => win_64_python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_python3.11.____cpythonpython_implcpython.yaml => win_64_python3.11.____cpython.yaml} (95%) rename .ci_support/{win_64_python3.8.____cpythonpython_implcpython.yaml => win_64_python3.12.____cpython.yaml} (89%) rename .ci_support/{win_64_python3.12.____cpythonpython_implcpython.yaml => win_64_python3.13.____cp313.yaml} (90%) delete mode 100644 .ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{win_64_python3.9.____cpythonpython_implcpython.yaml => win_64_python3.9.____cpython.yaml} (95%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cb24946..b866620 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,68 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_python3.10.____cpythonpython_implcpython + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpythonpython_implcpython: - CONFIG: linux_64_python3.11.____cpythonpython_implcpython + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpythonpython_implcpython: - CONFIG: linux_64_python3.12.____cpythonpython_implcpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_python3.8.____cpythonpython_implcpython + linux_64_python3.13.____cp313: + CONFIG: linux_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____73_pypypython_implpypy: - CONFIG: linux_64_python3.9.____73_pypypython_implpypy + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_python3.9.____cpythonpython_implcpython + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.10.____cpythonpython_implcpython + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.11.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.11.____cpythonpython_implcpython + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.12.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.12.____cpythonpython_implcpython + linux_aarch64_python3.13.____cp313: + CONFIG: linux_aarch64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython + linux_aarch64_python3.9.____cpython: + CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____73_pypypython_implpypy: - CONFIG: linux_aarch64_python3.9.____73_pypypython_implpypy + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.9.____cpythonpython_implcpython + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.10.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.10.____cpythonpython_implcpython + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.11.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.11.____cpythonpython_implcpython + linux_ppc64le_python3.13.____cp313: + CONFIG: linux_ppc64le_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.12.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.12.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____73_pypypython_implpypy: - CONFIG: linux_ppc64le_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.9.____cpythonpython_implcpython + linux_ppc64le_python3.9.____cpython: + CONFIG: linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +82,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1739c32..16c1bc2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,26 +5,23 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_python3.10.____cpythonpython_implcpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpythonpython_implcpython: - CONFIG: osx_64_python3.11.____cpythonpython_implcpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.12.____cpythonpython_implcpython: - CONFIG: osx_64_python3.12.____cpythonpython_implcpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_python3.8.____cpythonpython_implcpython + osx_64_python3.13.____cp313: + CONFIG: osx_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____73_pypypython_implpypy: - CONFIG: osx_64_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_python3.9.____cpythonpython_implcpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython @@ -35,18 +32,22 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_python3.13.____cp313: + CONFIG: osx_arm64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4ee7213..dfeab3b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,23 +8,20 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpythonpython_implcpython: - CONFIG: win_64_python3.10.____cpythonpython_implcpython + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpythonpython_implcpython: - CONFIG: win_64_python3.11.____cpythonpython_implcpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpythonpython_implcpython: - CONFIG: win_64_python3.12.____cpythonpython_implcpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpythonpython_implcpython: - CONFIG: win_64_python3.8.____cpythonpython_implcpython + win_64_python3.13.____cp313: + CONFIG: win_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - win_64_python3.9.____73_pypypython_implpypy: - CONFIG: win_64_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpythonpython_implcpython: - CONFIG: win_64_python3.9.____cpythonpython_implcpython + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -39,7 +36,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) @@ -57,6 +54,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 19c1c16..9f237ac 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index c22488f..6467829 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 92% rename from .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 96045b2..56ce859 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml similarity index 92% rename from .ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.13.____cp313.yaml index 4039484..405bd8c 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 4165ef5..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -zip_keys: -- - python - - python_impl - - channel_sources diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index b12757e..a535e54 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 95% rename from .ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index 4cd8ac2..9e0f399 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -15,7 +15,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml similarity index 95% rename from .ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.13.____cp313.yaml index ea423c9..d270651 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -15,7 +15,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index dba18fd..0000000 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,26 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -zip_keys: -- - python - - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.12.____cpython.yaml index 7e179a7..7337594 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml similarity index 94% rename from .ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.13.____cp313.yaml index c8e547c..f891217 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index c2643d6..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - python - - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.9.____cpython.yaml diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 2dd1ff4..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,43 +0,0 @@ -migrator_ts: 1647123563 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: False - longterm: True - use_local: False - check_solvable: True - exclude_pinned_pkgs: False - pr_limit: 10 - bump_number: 1 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - ignored_deps_per_node: - matplotlib: - - pyqt - -python: - - 3.8.* *_73_pypy # [not (osx and arm64)] - - 3.9.* *_73_pypy # [not (osx and arm64)] -numpy: - # part of a zip_keys: python, python_impl, numpy - - 1.20 # [not (osx and arm64)] - - 1.20 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 7d96a2e..8aeabfa 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 74e8a29..7bb5560 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 2bf4618..156b388 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml similarity index 85% rename from .ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.13.____cp313.yaml index a08d228..0c96e48 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: @@ -11,7 +13,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 7ba0de9..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.9.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - python - - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 3b8398b..ea3b205 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 212b4df..120f1b0 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 659927b..ed5e176 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 1c1076c..106e451 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,7 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml similarity index 77% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_python3.13.____cp313.yaml index 9b55f0d..b950a56 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -1,7 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main macos_machine: @@ -11,7 +13,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index a5fe792..d38e322 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml index b339ed3..432f042 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 95% rename from .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml index dd3d5b0..4158b22 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 89% rename from .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index 447f337..9a73584 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.13.____cp313.yaml similarity index 90% rename from .ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.13.____cp313.yaml index f4032d2..e83b20f 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: @@ -11,7 +13,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.13.* *_cp313 python_impl: - cpython target_platform: diff --git a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index f878864..0000000 --- a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -target_platform: -- win-64 -zip_keys: -- - python - - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index 0c5382b..f595e78 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 322832b..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -66,9 +68,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cd9a88f..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -38,16 +42,27 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index 4f968d4..18a2f8b 100644 --- a/README.md +++ b/README.md @@ -32,171 +32,143 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - @@ -221,10 +193,10 @@ Current build status - + @@ -235,45 +207,38 @@ Current build status - - - - + - + - + - + - + @@ -357,7 +322,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 957ac9688d01ab7a50146dcda8a7ddaba4f4f85e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 21 Sep 2024 22:38:10 +0200 Subject: [PATCH 3/7] Add setuptools as a build backend --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54810f0..c48f3de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ requirements: host: - python - pip # [win and python_impl != 'pypy'] + - setuptools # [win and python_impl != 'pypy'] run: - python From 8642fe16555f06ac2a8652dc97152a1cbe602a4a Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 24 Sep 2024 09:18:01 +0200 Subject: [PATCH 4/7] fix invalid escape in test script --- recipe/run_test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/run_test.py b/recipe/run_test.py index 87fc416..61ea6d8 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -64,9 +64,10 @@ ) ) ) - - pythoncom_filename = os.environ["LIBRARY_BIN"] + "\pythoncom" + conda_py + ".dll" - pywintypes_filename = os.environ["LIBRARY_BIN"] + "\pywintypes" + conda_py + ".dll" + + library_bin = os.environ["LIBRARY_BIN"] + pythoncom_filename = os.path.join(library_bin, f"pythoncom{conda_py}.dll") + pywintypes_filename = os.path.join(library_bin, f"pywintypes{conda_py}.dll") assert os.path.isfile(pythoncom_filename), pythoncom_filename assert os.path.isfile(pywintypes_filename), pywintypes_filename From f28ccb58ba1326adab2410a2d72add2a42845c11 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Oct 2024 09:26:24 +0200 Subject: [PATCH 5/7] Bump to 307 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c48f3de..3748aa5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "306" %} +{% set version = "307" %} package: name: pywin32 @@ -6,7 +6,7 @@ package: source: url: https://github.com/mhammond/pywin32/archive/b{{ version }}.tar.gz - sha256: 16e5ad3efbbf997080f67c3010bd4eb0067d499bbade9be1b240b7e85325c167 + sha256: 013ac06e7e59cb069df743c76a25545f359af1a6441a2d6e91e87429ee651851 patches: - 0003-remove-PATH-pth-hack.patch - do-not-build-scintilla.patch From b6e9586cafb9f187b203cd8b46ae8c43f8e86a5f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Oct 2024 09:28:50 +0200 Subject: [PATCH 6/7] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.1, and conda-forge-pinning 2024.10.11.07.13.32 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .../linux_64_python3.10.____cpython.yaml | 1 - .../linux_64_python3.11.____cpython.yaml | 1 - .../linux_64_python3.12.____cpython.yaml | 1 - .../linux_64_python3.13.____cp313.yaml | 3 +- .../linux_64_python3.9.____cpython.yaml | 1 - .../linux_aarch64_python3.10.____cpython.yaml | 1 - .../linux_aarch64_python3.11.____cpython.yaml | 1 - .../linux_aarch64_python3.12.____cpython.yaml | 1 - .../linux_aarch64_python3.13.____cp313.yaml | 3 +- .../linux_aarch64_python3.9.____cpython.yaml | 1 - .../linux_ppc64le_python3.10.____cpython.yaml | 1 - .../linux_ppc64le_python3.11.____cpython.yaml | 1 - .../linux_ppc64le_python3.12.____cpython.yaml | 1 - .../linux_ppc64le_python3.13.____cp313.yaml | 3 +- .../linux_ppc64le_python3.9.____cpython.yaml | 1 - .../osx_64_python3.10.____cpython.yaml | 1 - .../osx_64_python3.11.____cpython.yaml | 1 - .../osx_64_python3.12.____cpython.yaml | 1 - .ci_support/osx_64_python3.13.____cp313.yaml | 3 +- .ci_support/osx_64_python3.9.____cpython.yaml | 1 - .../osx_arm64_python3.10.____cpython.yaml | 1 - .../osx_arm64_python3.11.____cpython.yaml | 1 - .../osx_arm64_python3.12.____cpython.yaml | 1 - .../osx_arm64_python3.13.____cp313.yaml | 3 +- .../osx_arm64_python3.9.____cpython.yaml | 1 - .../win_64_python3.10.____cpython.yaml | 1 - .../win_64_python3.11.____cpython.yaml | 1 - .../win_64_python3.12.____cpython.yaml | 1 - .ci_support/win_64_python3.13.____cp313.yaml | 3 +- .ci_support/win_64_python3.9.____cpython.yaml | 1 - .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 +-- azure-pipelines.yml | 33 ++++++++++++++++--- build-locally.py | 5 ++- 35 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 16c1bc2..8f00930 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 9f237ac..30e156f 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 6467829..d8bf900 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 56ce859..d48e635 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index 405bd8c..a0029fb 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index a535e54..679c22d 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 1857783..1512de8 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index ab292bf..bd6e6c6 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 9e0f399..32b53a1 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml index d270651..738e86b 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 7a90433..d48f50b 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index b5bc3a5..1009077 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index d6676b1..86b338c 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 7337594..01e39e3 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml index f891217..df2cbad 100644 --- a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index ad21275..a37b22b 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -19,4 +19,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 8aeabfa..bf26c58 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 7bb5560..373962c 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 156b388..c657714 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 0c96e48..61f6a4d 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index ea3b205..a8d0f48 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 120f1b0..7369c06 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index ed5e176..1fd8443 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 106e451..2f3ed82 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index b950a56..ed93a50 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index d38e322..7fe93bc 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 432f042..6556262 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 4158b22..73e24d6 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 9a73584..51c1e3b 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml index e83b20f..ee0135a 100644 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index f595e78..c5fbeae 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -21,4 +21,3 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..32da3d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From 398f6f53a7d893ca8d87d3729b50a16c85158f95 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 24 May 2024 08:51:44 +0200 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=A7=AA=20(manually=20install=20missin?= =?UTF-8?q?g=20VS=20components=20on=20windows)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit work-around for https://github.com/actions/runner-images/issues/9873 --- .azure-pipelines/azure-pipelines-win.yml | 32 +++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index dfeab3b..1b786d7 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -47,6 +47,36 @@ jobs: - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" displayName: Add conda to PATH + - powershell: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToRemove= @( + "Microsoft.VisualStudio.Component.VC.ATL" + "Microsoft.VisualStudio.Component.VC.ATLMFC" + "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre" + ) + [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + # should be run twice + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + + - powershell: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToRemove= @( + "Microsoft.VisualStudio.Component.VC.v141.ATL" + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL" + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre" + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC" + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre" + ) + [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --add " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + # should be run twice + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build @@ -61,4 +91,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)
VariantStatus
linux_64_python3.10.____cpythonpython_implcpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonpython_implcpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_python3.12.____cpythonpython_implcpythonlinux_64_python3.12.____cpython - variant + variant
linux_64_python3.8.____cpythonpython_implcpythonlinux_64_python3.13.____cp313 - variant + variant
linux_64_python3.9.____73_pypypython_implpypylinux_64_python3.9.____cpython - variant + variant
linux_64_python3.9.____cpythonpython_implcpythonlinux_aarch64_python3.10.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonpython_implcpythonlinux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_python3.11.____cpythonpython_implcpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_aarch64_python3.12.____cpythonpython_implcpythonlinux_aarch64_python3.13.____cp313 - variant + variant
linux_aarch64_python3.8.____cpythonpython_implcpythonlinux_aarch64_python3.9.____cpython - variant + variant
linux_aarch64_python3.9.____73_pypypython_implpypylinux_ppc64le_python3.10.____cpython - variant + variant
linux_aarch64_python3.9.____cpythonpython_implcpythonlinux_ppc64le_python3.11.____cpython - variant + variant
linux_ppc64le_python3.10.____cpythonpython_implcpythonlinux_ppc64le_python3.12.____cpython - variant + variant
linux_ppc64le_python3.11.____cpythonpython_implcpythonlinux_ppc64le_python3.13.____cp313 - variant + variant
linux_ppc64le_python3.12.____cpythonpython_implcpythonlinux_ppc64le_python3.9.____cpython - variant + variant
linux_ppc64le_python3.8.____cpythonpython_implcpythonosx_64_python3.10.____cpython - variant + variant
linux_ppc64le_python3.9.____73_pypypython_implpypyosx_64_python3.11.____cpython - variant + variant
linux_ppc64le_python3.9.____cpythonpython_implcpythonosx_64_python3.12.____cpython - variant + variant
osx_64_python3.10.____cpythonpython_implcpythonosx_64_python3.13.____cp313 - variant + variant
osx_64_python3.11.____cpythonpython_implcpythonosx_64_python3.9.____cpython - variant - -
osx_64_python3.12.____cpythonpython_implcpython - - variant - -
osx_64_python3.8.____cpythonpython_implcpython - - variant - -
osx_64_python3.9.____73_pypypython_implpypy - - variant - -
osx_64_python3.9.____cpythonpython_implcpython - - variant + variant
osx_arm64_python3.8.____cpythonosx_arm64_python3.13.____cp313 - variant + variant
win_64_python3.10.____cpythonpython_implcpython - - variant - -
win_64_python3.11.____cpythonpython_implcpythonwin_64_python3.10.____cpython - variant + variant
win_64_python3.12.____cpythonpython_implcpythonwin_64_python3.11.____cpython - variant + variant
win_64_python3.8.____cpythonpython_implcpythonwin_64_python3.12.____cpython - variant + variant
win_64_python3.9.____73_pypypython_implpypywin_64_python3.13.____cp313 - variant + variant
win_64_python3.9.____cpythonpython_implcpythonwin_64_python3.9.____cpython - variant + variant