From 714b8506e6fe78d00f24974c4dfe77626bb0a002 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Sep 2023 04:52:38 +0000 Subject: [PATCH 1/6] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 42 +++++++++++++++++++++++++++ conda-forge.yml | 4 +-- recipe/meta.yaml | 2 +- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..00b33ef --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,42 @@ +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: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: + - 3.12.* *_cpython +channel_sources: + - conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/conda-forge.yml b/conda-forge.yml index b03944b..f7aa9b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,7 @@ build_platform: osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -9,5 +11,3 @@ provider: linux_ppc64le: azure win: azure test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 105512a..9851e29 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: - 0001-Don-t-add-build_root-giscanner-to-PYTHONPATH-for-run.patch build: - number: 0 + number: 1 skip: true # [py<35] requirements: From c2680dec540547617239d05c77654bcc8bc05b50 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Sep 2023 04:53:13 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and conda-forge-pinning 2023.09.21.23.09.50 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++ .azure-pipelines/azure-pipelines-osx.yml | 6 + .azure-pipelines/azure-pipelines-win.yml | 59 ++------- .../linux_64_python3.10.____cpython.yaml | 3 + .../linux_64_python3.11.____cpython.yaml | 3 + .../linux_64_python3.12.____cpython.yaml | 29 +++++ .../linux_64_python3.8.____cpython.yaml | 3 + .../linux_64_python3.9.____73_pypy.yaml | 3 + .../linux_64_python3.9.____cpython.yaml | 3 + .../linux_aarch64_python3.10.____cpython.yaml | 3 + .../linux_aarch64_python3.11.____cpython.yaml | 3 + .../linux_aarch64_python3.12.____cpython.yaml | 33 +++++ .../linux_aarch64_python3.8.____cpython.yaml | 3 + .../linux_aarch64_python3.9.____73_pypy.yaml | 3 + .../linux_aarch64_python3.9.____cpython.yaml | 3 + .../linux_ppc64le_python3.10.____cpython.yaml | 3 + .../linux_ppc64le_python3.11.____cpython.yaml | 3 + .../linux_ppc64le_python3.12.____cpython.yaml | 29 +++++ .../linux_ppc64le_python3.8.____cpython.yaml | 3 + .../linux_ppc64le_python3.9.____73_pypy.yaml | 3 + .../linux_ppc64le_python3.9.____cpython.yaml | 3 + .../osx_64_python3.10.____cpython.yaml | 3 + .../osx_64_python3.11.____cpython.yaml | 3 + .../osx_64_python3.12.____cpython.yaml | 29 +++++ .ci_support/osx_64_python3.8.____cpython.yaml | 3 + .ci_support/osx_64_python3.9.____73_pypy.yaml | 3 + .ci_support/osx_64_python3.9.____cpython.yaml | 3 + .../osx_arm64_python3.10.____cpython.yaml | 3 + .../osx_arm64_python3.11.____cpython.yaml | 3 + .../osx_arm64_python3.12.____cpython.yaml | 29 +++++ .../osx_arm64_python3.8.____cpython.yaml | 3 + .../osx_arm64_python3.9.____cpython.yaml | 3 + .../win_64_python3.10.____cpython.yaml | 3 + .../win_64_python3.11.____cpython.yaml | 3 + .../win_64_python3.12.____cpython.yaml | 23 ++++ .ci_support/win_64_python3.8.____cpython.yaml | 3 + .ci_support/win_64_python3.9.____73_pypy.yaml | 3 + .ci_support/win_64_python3.9.____cpython.yaml | 3 + .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 8 +- .scripts/run_win_build.bat | 115 ++++++++++++++++++ README.md | 42 +++++++ 43 files changed, 455 insertions(+), 59 deletions(-) create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index dd4de54..6c8d922 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpython: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -36,6 +40,10 @@ jobs: CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_python3.8.____cpython: CONFIG: linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -56,6 +64,10 @@ jobs: CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_python3.8.____cpython: CONFIG: linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8e0b544..2d83e68 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,6 +14,9 @@ jobs: osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -29,6 +32,9 @@ jobs: osx_arm64_python3.11.____cpython: CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_python3.8.____cpython: CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 83c1bf9..752cc4d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,9 @@ jobs: win_64_python3.11.____cpython: CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpython: CONFIG: win_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -29,6 +32,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -47,55 +51,14 @@ 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 + 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_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index e10102e..c10206b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.10.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 21e47a8..3ea6efc 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..613a764 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cairo: +- '1' +cdt_name: +- cos6 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +glib: +- '2' +libffi: +- '3.4' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 07776ac..d989acb 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.8.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index 2cb304f..3b37e01 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_73_pypy target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 4f661b8..3b2c59b 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index ec5a3fe..811f026 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -28,3 +28,6 @@ python: - 3.10.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index eeb5cfe..8560ead 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -28,3 +28,6 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml new file mode 100644 index 0000000..31cae0e --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -0,0 +1,33 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +glib: +- '2' +libffi: +- '3.4' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 2d47484..3bea7ce 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -28,3 +28,6 @@ python: - 3.8.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index d6211ba..46cbfa0 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -28,3 +28,6 @@ python: - 3.9.* *_73_pypy target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index c960251..b37b976 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -28,3 +28,6 @@ python: - 3.9.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 27d6476..3c87cc8 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.10.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 7e40de1..27a65a6 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml new file mode 100644 index 0000000..571dfca --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +glib: +- '2' +libffi: +- '3.4' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index d6b7a24..cf915e6 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.8.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml index 24e1f63..3f2147c 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_73_pypy target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 142ee79..cecfd02 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index b0eebeb..3b16939 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.10.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 88e5a52..805f789 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..2c3cef5 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '15' +cairo: +- '1' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +glib: +- '2' +libffi: +- '3.4' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index c9c9a8e..1c049dc 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.8.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index b88dfc2..48ce22d 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_73_pypy target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index c3be059..ed3b782 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index a674000..9875e75 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.10.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 53bccb3..d98a107 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml new file mode 100644 index 0000000..d3b632f --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +cairo: +- '1' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +glib: +- '2' +libffi: +- '3.4' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 06fbe01..82f7876 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.8.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 9cdb1b8..63a3447 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -24,3 +24,6 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index ed10fa2..26802c7 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -18,3 +18,6 @@ python: - 3.10.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index ceb31a9..cc3366a 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -18,3 +18,6 @@ python: - 3.11.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..2f99035 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +cairo: +- '1' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +glib: +- '2' +libffi: +- '3.4' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index e382e9d..ad4b8a9 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -18,3 +18,6 @@ python: - 3.8.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml index 9ea13b4..086fb7d 100644 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -18,3 +18,6 @@ python: - 3.9.* *_73_pypy target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 41db328..ea286fa 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -18,3 +18,6 @@ python: - 3.9.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c21a6cb..07351cc 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 3969edf..cd9a88f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -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 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 06663bc..2f30b5a 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,13 @@ Current build status variant + + linux_64_python3.12.____cpython + + + variant + + linux_64_python3.8.____cpython @@ -75,6 +82,13 @@ Current build status variant + + linux_aarch64_python3.12.____cpython + + + variant + + linux_aarch64_python3.8.____cpython @@ -110,6 +124,13 @@ Current build status variant + + linux_ppc64le_python3.12.____cpython + + + variant + + linux_ppc64le_python3.8.____cpython @@ -145,6 +166,13 @@ Current build status variant + + osx_64_python3.12.____cpython + + + variant + + osx_64_python3.8.____cpython @@ -180,6 +208,13 @@ Current build status variant + + osx_arm64_python3.12.____cpython + + + variant + + osx_arm64_python3.8.____cpython @@ -208,6 +243,13 @@ Current build status variant + + win_64_python3.12.____cpython + + + variant + + win_64_python3.8.____cpython From 16af04b368cfb62d408579fe71476b65898a8117 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Sun, 24 Sep 2023 12:12:17 +0200 Subject: [PATCH 3/6] add dev_url --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9851e29..064c708 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -160,6 +160,7 @@ about: license_family: LGPL license_file: COPYING summary: Middleware for binding GObject-based code to other languages. + dev_url: https://gitlab.gnome.org/GNOME/gobject-introspection extra: feedstock-name: {{ name|lower }} From 1f2ebd9c73a66bddf41b21fde0a046dc45ee58f7 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Sun, 24 Sep 2023 12:13:14 +0200 Subject: [PATCH 4/6] Remove obsolete skip --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 064c708..92d21f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ source: build: number: 1 - skip: true # [py<35] requirements: build: From baf77da60b80bc0f8d09ff434341d0385a305203 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Sun, 24 Sep 2023 17:48:40 -0400 Subject: [PATCH 5/6] Add setuptools as a host dep to make Meson happy This is the current recommendation in https://github.com/mesonbuild/meson/issues/7702 to deal with Python 3.12's removal of distutils. --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92d21f0..fa3ffd8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,6 +47,7 @@ requirements: - glib - libffi - python + - setuptools outputs: - name: libgirepository @@ -89,6 +90,7 @@ outputs: - glib {{ local_glib_pin }} - glib - python + - setuptools run: - pkg-config - python @@ -139,6 +141,7 @@ outputs: - glib - libffi - python + - setuptools run: - {{ pin_subpackage('g-ir-build-tools', exact=True) }} - {{ pin_subpackage('g-ir-host-tools', exact=True) }} From 4a2e819609b0278c34061708516831ad0e2c4f30 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Mon, 2 Oct 2023 04:09:10 +0200 Subject: [PATCH 6/6] Add run-dep on setuptools for g-ir-build-tools --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fa3ffd8..dc8d51b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,7 +47,7 @@ requirements: - glib - libffi - python - - setuptools + - setuptools # [py>311] outputs: - name: libgirepository @@ -90,10 +90,12 @@ outputs: - glib {{ local_glib_pin }} - glib - python - - setuptools + - setuptools # [py>311] run: - pkg-config - python + # run-dep as a workaround for now; upstream package still imports from distutils + - setuptools # [py>311] test: commands: - g-ir-scanner --help # [not win] @@ -141,7 +143,7 @@ outputs: - glib - libffi - python - - setuptools + - setuptools # [py>311] run: - {{ pin_subpackage('g-ir-build-tools', exact=True) }} - {{ pin_subpackage('g-ir-host-tools', exact=True) }}