diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9a99e7a..f183db2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,38 +8,33 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____73_pypy: - CONFIG: linux_64_numpy1.20python3.8.____73_pypy + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____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.20python3.9.____73_pypy: - CONFIG: linux_64_numpy1.20python3.9.____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.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____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 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 982b2d0..17ec432 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,36 +8,39 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____73_pypy: - CONFIG: osx_64_numpy1.20python3.8.____73_pypy + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____73_pypy: - CONFIG: osx_64_numpy1.20python3.9.____73_pypy + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.8.____cpython: - CONFIG: osx_arm64_numpy1.20python3.8.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.9.____cpython: - CONFIG: osx_arm64_numpy1.20python3.9.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.9.____cpython: + CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 04cb493..eb06130 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,32 +5,34 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: - win_64_numpy1.20python3.8.____73_pypy: - CONFIG: win_64_numpy1.20python3.8.____73_pypy + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.8.____cpython: - CONFIG: win_64_numpy1.20python3.8.____cpython + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____73_pypy: - CONFIG: win_64_numpy1.20python3.9.____73_pypy + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____cpython: - CONFIG: win_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -49,49 +51,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install 'python=3.9' 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" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - 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:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + 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.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index fd0f091..ceff149 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 23a75ae..ed3301e 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index e5229ab..3cdad21 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index ebf1f73..a0c5b4c 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index eb6a376..f2dd8b4 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml similarity index 79% rename from .ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index a924305..77d7b8c 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,27 +1,27 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython target_platform: - linux-64 zip_keys: @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python312.yaml similarity index 66% rename from .ci_support/migrations/python311.yaml rename to .ci_support/migrations/python312.yaml index 2715ab2..89749ad 100644 --- a/.ci_support/migrations/python311.yaml +++ b/.ci_support/migrations/python312.yaml @@ -1,4 +1,4 @@ -migrator_ts: 1666686085 +migrator_ts: 1695046563 __migrator: migration_number: 1 operation: key_add @@ -10,15 +10,16 @@ __migrator: - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython - - 3.11.* *_cpython # new entry + - 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: 30 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times + pr_limit: 60 + 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 @@ -27,11 +28,15 @@ __migrator: - cross-python - python_abi exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources python: - - 3.11.* *_cpython + - 3.12.* *_cpython +channel_sources: + - conda-forge/label/python_rc,conda-forge # additional entries to add for zip_keys numpy: - - 1.23 + - 1.26 python_impl: - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index e7bc650..211212b 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index cabfa0a..f238b76 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index b316b4c..5c57bb9 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 0668a22..1685c6a 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 7a10ec2..9b9fd2c 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 2dbc1c0..9aaa163 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -3,25 +3,25 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython target_platform: - osx-64 zip_keys: @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 109a8ff..b19a27e 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 274b7e9..e1419cf 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index b3b5a64..ec760a5 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index ebbb99c..8d9ba61 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -29,3 +29,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..041eac2 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,32 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index b5a0e6a..bc330f1 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index b88a239..2f4864a 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 7c81a1b..4f8aaba 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/win_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 6e1bd51..468bdf6 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index ac9d153..3637894 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -19,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 71% rename from .ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 25778c8..87f023e 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,21 +1,22 @@ c_compiler: - vs2019 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 numpy: -- '1.20' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython target_platform: - win-64 zip_keys: - - python - numpy + - channel_sources diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..322832b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -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 boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 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_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..cd9a88f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." -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 boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup @@ -56,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -76,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..07d3445 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: 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 + +:: 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 +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%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: 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 cc93b1c..73e11da 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About meshpy -============ +About meshpy-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/meshpy-feedstock/blob/main/LICENSE.txt) Home: http://github.com/inducer/meshpy Package license: MIT AND LicenseRef-Proprietary-Triangle AND AGPL-3.0-or-later -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/meshpy-feedstock/blob/main/LICENSE.txt) - Summary: Triangular and Tetrahedral Mesh Generator Development: https://github.com/inducer/meshpy @@ -49,157 +49,164 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + diff --git a/conda-forge.yml b/conda-forge.yml index 32cb0e0..481f07e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,9 @@ build_platform: osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 53464d0..1c780f3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 script: - {{ PYTHON }} -m pip install . --no-deps -v - echo src/cpp/tetgen-LICENSE >> doc/faq.rst
VariantStatus
linux_64_numpy1.20python3.8.____73_pypylinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.20python3.8.____cpythonlinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.20python3.9.____73_pypylinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.20python3.9.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.23python3.11.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
osx_64_numpy1.20python3.8.____73_pypyosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.20python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.20python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.20python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.23python3.11.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_numpy1.20python3.8.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.20python3.9.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpython - variant + variant
win_64_numpy1.20python3.8.____73_pypyosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_numpy1.20python3.8.____cpythonwin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.20python3.9.____73_pypywin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.20python3.9.____cpythonwin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.10.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpython - variant + variant + +
win_64_numpy1.26python3.12.____cpython + + variant