diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..18e9e16d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.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 +94,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 e3774bfd..59e6f8f9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.9.____cpython: - CONFIG: osx_arm64_numpy1.21python3.9.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.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 7f5ab156..6e15e527 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,23 +8,23 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -32,6 +32,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - 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" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + 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) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..b8daebf1 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,6 +30,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: @@ -33,8 +39,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..f388627e 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,6 +30,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-64 tk: @@ -33,8 +39,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 79e954eb..05641802 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +30,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: @@ -33,8 +39,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 918e96ea..7af28a28 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +30,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: @@ -33,8 +39,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..1d4a371c --- /dev/null +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index e8fe600d..8bd91636 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +30,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: @@ -33,8 +39,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 80% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..cef37ec8 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -21,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +34,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: @@ -37,8 +43,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 80% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..77b6980a 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -21,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -30,6 +34,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: @@ -37,8 +43,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 80% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index b5881ca1..32d8f8be 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -21,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -30,6 +34,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: @@ -37,8 +43,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 80% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 48aac766..90f4f57d 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -21,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -30,6 +34,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: @@ -37,8 +43,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..283a8faf --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,52 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 80% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 47c1c822..543d2d75 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -21,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -30,6 +34,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: @@ -37,8 +43,10 @@ tk: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..9abb1ed2 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,13 +30,17 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 78% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..9a6bb269 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,13 +30,17 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 78% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 61235591..502ba847 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,13 +30,17 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 78% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index bb4e5c7c..8082b25b 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,13 +30,17 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..eca6816f --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 78% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 295f54ec..e05cf813 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,13 +30,17 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 00000000..4e6d3ca6 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,48 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +migrator_ts: 1713572489.295986 diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml index 741fc1eb..29fb4514 100644 --- a/.ci_support/migrations/pypy38.yaml +++ b/.ci_support/migrations/pypy38.yaml @@ -1,43 +1,42 @@ 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 + 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.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: 5 + bump_number: 1 + commit_message: "Rebuild for 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.19 # [not (osx and arm64)] - - 1.19 # [not (osx and arm64)] + - 1.22 # [not (osx and arm64)] python_impl: - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__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.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 00000000..d71f6f16 --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__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.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 5 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..1951701e 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,25 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -28,6 +32,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: @@ -37,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..b58f5cad 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,25 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -28,6 +32,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: @@ -37,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 4ea79216..9849babc 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -1,25 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -28,6 +32,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: @@ -37,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 1e07c6dc..8bece27e 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -1,25 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -28,6 +32,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: @@ -37,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..27153b17 --- /dev/null +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 76% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 343432f7..b09af5bc 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -1,25 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -28,6 +32,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: @@ -37,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 74% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..3a0cd289 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,23 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -26,6 +32,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: @@ -35,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 75% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 0ea2a16e..ba568df0 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -1,23 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +32,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: @@ -35,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 75% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index c28d327f..a0abbd47 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -1,23 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +32,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: @@ -35,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..b4f058db --- /dev/null +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 75% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index f65aaa70..b16e8d27 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -1,23 +1,29 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -26,6 +32,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: @@ -35,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fedd13d1..00000000 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- vs2019 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 81% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..161eb641 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -1,15 +1,17 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - vs2019 freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: @@ -25,4 +29,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 81% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..ae3ff9b6 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,15 +1,17 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - vs2019 freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - win-64 zip_keys: @@ -25,4 +29,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index d0c2292c..707bef84 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -1,15 +1,17 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - vs2019 freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: @@ -25,4 +29,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 22caa20a..b59b3abc 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -1,15 +1,17 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - vs2019 freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: @@ -25,4 +29,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..88e7a2c9 --- /dev/null +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,32 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +qhull: +- '2020.2' +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 72e65a6a..2a73589e 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -1,15 +1,17 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge matplotlib_rc +- conda-forge main cxx_compiler: - vs2019 freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: @@ -25,4 +29,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 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 c89ecb7d..179afe55 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 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +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 \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + 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 conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ 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/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -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 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -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 \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + 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 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 new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +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 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 +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + 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-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:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..b756a8de 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/matplotlib-feed Home: http://matplotlib.org/ -Package license: [LicenseRef-PSF-2.0 and CC0-1.0](http://matplotlib.sourceforge.net/users/license.html) +Package license: [PSF-2.0](http://matplotlib.sourceforge.net/users/license.html) Summary: Publication quality figures in Python @@ -38,241 +38,248 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + @@ -357,7 +364,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 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..d03ab030 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,9 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + error_overlinking: true + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +18,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated diff --git a/recipe/build_base.bat b/recipe/build_base.bat index ec835b6d..6737f63f 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,17 +1,23 @@ -set LIB=%LIBRARY_LIB%;%LIB% -set LIBPATH=%LIBRARY_LIB%;%LIBPATH% -set INCLUDE=%LIBRARY_INC%;%INCLUDE% +@echo on -ECHO [directories] > mplsetup.cfg -ECHO basedirlist = %LIBRARY_PREFIX% >> mplsetup.cfg -ECHO [packages] >> mplsetup.cfg -ECHO tests = False >> mplsetup.cfg -ECHO sample_data = False >> mplsetup.cfg -ECHO toolkits_tests = False >> mplsetup.cfg -ECHO [libs] >> mplsetup.cfg -ECHO system_freetype = True >> mplsetup.cfg +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" -set MPLSETUPCFG=mplsetup.cfg +if "%CI%" == "azure" ( + :: Hack to try removing problematic Python from Azure CI image + :: Replace with conda-smithy solution when available + :: xref: https://github.com/conda-forge/conda-smithy/pull/1966 + mkdir C:\empty + robocopy /purge /r:0 /w:0 /mt /ns /nc /np /nfl /ndl /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 + rmdir /q C:\hostedtoolcache\windows\Python + rmdir /q C:\empty +) -%PYTHON% -m pip install --no-deps --no-build-isolation -vv . +mkdir builddir +if errorlevel 1 exit 1 +%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% +type builddir\meson-logs\meson-log.txt +%PYTHON% -m build --wheel ^ + --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v +if errorlevel 1 exit 1 +%PYTHON% -m pip install --find-links dist matplotlib if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index c2b84c9a..78bd7b11 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -1,22 +1,14 @@ #!/bin/bash -cat < conda_mpl_config.cfg -[directories] -basedirlist = $PREFIX +set -ex -[packages] -tests = False -toolkit_tests = False -sample_data = False +export AR=$GCC_AR -[libs] -system_freetype = True +export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" -EOF - -cat conda_mpl_config.cfg -sed -i.bak "s|/usr/local|${PREFIX}|" setupext.py - -export MPLSETUPCFG=conda_mpl_config.cfg - -$PYTHON -m pip install --no-deps --no-build-isolation -vv . +mkdir builddir +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS +cat builddir/meson-logs/meson-log.txt +$PYTHON -m build --wheel \ + --no-isolation --skip-dependency-check -Cbuilddir=builddir +$PYTHON -m pip install --find-links dist matplotlib diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 1ceddbc0..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -channel_targets: - - conda-forge matplotlib_rc -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.12" # [osx and x86_64] -MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.12 # [osx and x86_64] \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 967e6a84..aef1fa04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ # Full credit goes to https://github.com/conda/conda-recipes for providing this recipe. # It has been subsequently adapted for automated building with conda-forge. -{% set version = "3.8.0rc1" %} +{% set version = "3.9.0" %} package: name: matplotlib-suite @@ -9,7 +9,7 @@ package: source: url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz - sha256: f97316cbd46b5d28699254e3520e295e30b3deb6ec43b7a1aac62bffa2d9f497 + sha256: 89877b314fe950b7abc118c1e518b0cc82fa9bb6e1228d26560e82be96ac009a build: number: 0 @@ -22,46 +22,59 @@ outputs: skip: true # [py<39] ignore_run_exports_from: - zlib + script_env: + # Workaround an upstream conda-build issue w/pip & `outputs` by setting env vars manually. + # Drop once conda-build 24.7.0 is released. + # xref: https://github.com/conda/conda-build/issues/3993 + - PIP_NO_BUILD_ISOLATION=False + - PIP_NO_DEPENDENCIES=True + - PIP_IGNORE_INSTALLED=True + - PIP_CACHE_DIR=pip_cache + - PIP_NO_INDEX=True requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - - pkg-config # [not win] + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - - libtool # [unix] + - cmake # [win] + - pkg-config + - libtool # [unix] + - ninja host: - python + - python-build - pip - - certifi>=2020.06.20 + - meson-python >=0.13.1 + - certifi >=2020.06.20 - pybind11 >=2.6 - freetype + - qhull # freetype.pc requires zlib.pc - zlib - numpy - - setuptools >=42 + - setuptools >=64 - setuptools_scm >=7 - setuptools_scm_git_archive - tk # [linux] run: - python - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] - certifi >=2020.06.20 - contourpy >=1.0.1 - cycler >=0.10 - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.21 - - {{ pin_compatible('numpy') }} + - kiwisolver >=1.3.1 + - numpy >=1.23 - packaging >=20.0 - - pillow >=6.2.0 + - pillow >=8 - pyparsing >=2.3.1 - python-dateutil >=2.7 - freetype - tk # [linux] - - importlib-resources>=3.2.0 # [py<310] + - importlib-resources >=3.2.0 # [py<310] test: imports: - matplotlib @@ -94,7 +107,7 @@ outputs: about: home: http://matplotlib.org/ - license: LicenseRef-PSF-2.0 and CC0-1.0 + license: PSF-2.0 license_url: http://matplotlib.sourceforge.net/users/license.html license_family: PSF license_file: LICENSE/LICENSE
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy2.0python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy2.0python3.11.____cpython - variant + variant
linux_64_numpy1.21python3.9.____cpythonlinux_64_numpy2.0python3.12.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_numpy2.0python3.9.____cpython - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy2.0python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy2.0python3.11.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy2.0python3.12.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_numpy2.0python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy2.0python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy2.0python3.11.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy2.0python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonlinux_ppc64le_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_numpy2.0python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy2.0python3.9.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy2.0python3.10.____cpython - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy2.0python3.11.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_numpy2.0python3.12.____cpython - variant + variant + +
win_64_numpy2.0python3.9.____cpython + + variant