From 62d8cef359ca7c63f3a5c41314d9fa9f090745bb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:38:28 +0000 Subject: [PATCH 1/2] 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..89749ad --- /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: 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 + - 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 7fa1e2c..0fca964 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -4,6 +4,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -12,5 +14,3 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2b5226c..6706c94 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: e73ee6b32d639c9b8cf4b4aded334ba158be5f8313544e056f796ace0a10ae63 build: - number: 0 + number: 1 script: - {{ PYTHON }} -m pip install . -vv - rm "${SP_DIR}/pulp/solverdir/CoinMP.dll" # [not win] From d67249809dd0459783a0f633c10cb0b3b203a16e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:38:44 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and conda-forge-pinning 2023.09.22.17.00.20 --- .azure-pipelines/azure-pipelines-linux.yml | 17 +-- .azure-pipelines/azure-pipelines-osx.yml | 7 +- .azure-pipelines/azure-pipelines-win.yml | 57 ++------- .../linux_64_python3.10.____cpython.yaml | 3 + .../linux_64_python3.11.____cpython.yaml | 3 + ...l => linux_64_python3.12.____cpython.yaml} | 7 +- .../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} | 7 +- .../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} | 7 +- .../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 + ...aml => osx_64_python3.12.____cpython.yaml} | 7 +- .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 | 19 +++ .../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 + ...aml => win_64_python3.12.____cpython.yaml} | 7 +- .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 | 18 +-- .scripts/run_win_build.bat | 115 ++++++++++++++++++ README.md | 35 +++--- 43 files changed, 305 insertions(+), 98 deletions(-) rename .ci_support/{linux_64_python3.8.____73_pypy.yaml => linux_64_python3.12.____cpython.yaml} (68%) rename .ci_support/{linux_aarch64_python3.8.____73_pypy.yaml => linux_aarch64_python3.12.____cpython.yaml} (73%) rename .ci_support/{linux_ppc64le_python3.8.____73_pypy.yaml => linux_ppc64le_python3.12.____cpython.yaml} (69%) rename .ci_support/{osx_64_python3.8.____73_pypy.yaml => osx_64_python3.12.____cpython.yaml} (68%) create mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml rename .ci_support/{win_64_python3.8.____73_pypy.yaml => win_64_python3.12.____cpython.yaml} (59%) 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 495c0fc..8482aa3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,8 +16,8 @@ jobs: CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____73_pypy: - CONFIG: linux_64_python3.8.____73_pypy + 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: @@ -40,8 +40,8 @@ jobs: CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____73_pypy: - CONFIG: linux_aarch64_python3.8.____73_pypy + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.8.____cpython: @@ -64,8 +64,8 @@ jobs: CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____73_pypy: - CONFIG: linux_ppc64le_python3.8.____73_pypy + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.8.____cpython: @@ -83,11 +83,6 @@ jobs: 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 79d3965..2d83e68 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,8 +14,8 @@ jobs: osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____73_pypy: - CONFIG: osx_64_python3.8.____73_pypy + 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 @@ -32,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 088335b..752cc4d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_python3.10.____cpython: @@ -14,8 +14,8 @@ jobs: win_64_python3.11.____cpython: CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____73_pypy: - CONFIG: win_64_python3.8.____73_pypy + 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 @@ -29,8 +29,10 @@ jobs: 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 "py-lief<0.12" -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_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 84cccee..9d50e53 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -14,3 +14,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 66befba..68f6ddb 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -14,3 +14,6 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 68% rename from .ci_support/linux_64_python3.8.____73_pypy.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 1b0ff54..bd97fe9 100644 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -11,6 +11,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 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 7b5ae5c..ea19c65 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -14,3 +14,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 b3364bb..abd9c97 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -14,3 +14,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 50d8196..89ab107 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -14,3 +14,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 299cd0e..12f7689 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -18,3 +18,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 8709b79..683e6ca 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -18,3 +18,6 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 73% rename from .ci_support/linux_aarch64_python3.8.____73_pypy.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index 9b2ca65..e97deb0 100644 --- a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -15,6 +15,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 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 7323df3..392918f 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -18,3 +18,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 44a9cd9..51f805f 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -18,3 +18,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 bb5774a..e449d49 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -18,3 +18,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 61b2f3a..d9c4205 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -14,3 +14,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 972f206..6d0f0c5 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -14,3 +14,6 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml similarity index 69% rename from .ci_support/linux_ppc64le_python3.8.____73_pypy.yaml rename to .ci_support/linux_ppc64le_python3.12.____cpython.yaml index 9089ec0..4ffb681 100644 --- a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -11,6 +11,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 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 feefdfc..6b1c51d 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -14,3 +14,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 ec88c9b..40aa1e2 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -14,3 +14,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 0cb27a4..a5db714 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -14,3 +14,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 48d3e80..33b193b 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -14,3 +14,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 2b912fb..4dd449b 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -14,3 +14,6 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 68% rename from .ci_support/osx_64_python3.8.____73_pypy.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index f92fbea..462f864 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main macos_machine: @@ -11,6 +11,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 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 76bbd40..2b1be65 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -14,3 +14,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 064e9b0..2ece960 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -14,3 +14,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 ab5e193..af0a031 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -14,3 +14,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 22ade12..7a06336 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -14,3 +14,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 68628f5..5a05174 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -14,3 +14,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..c49dc65 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,19 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +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 2f767b1..bfba5bd 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -14,3 +14,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 cd4fc0a..964d4f5 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -14,3 +14,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 d30d308..0ef1251 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -10,3 +10,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 05291b6..a2a26ef 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -10,3 +10,6 @@ python: - 3.11.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/win_64_python3.8.____73_pypy.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 59% rename from .ci_support/win_64_python3.8.____73_pypy.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index e262846..b91eb58 100644 --- a/.ci_support/win_64_python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,5 @@ channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main pin_run_as_build: @@ -7,6 +7,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 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 4f0d022..8dd422f 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -10,3 +10,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 205b9e8..b37259a 100644 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -10,3 +10,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 53204fb..62d013f 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -10,3 +10,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 84431a6..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 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +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 b3abaeb..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 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +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 @@ -55,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 @@ -75,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 c51259d..3ad5e21 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About pulp -========== +About pulp-feedstock +==================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/pulp-feedstock/blob/main/LICENSE.txt) Home: https://github.com/coin-or/pulp Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/pulp-feedstock/blob/main/LICENSE.txt) - Summary: PuLP is an LP modeler written in python. PuLP can generate MPS or LP files and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to solve linear problems. @@ -47,10 +47,10 @@ Current build status - linux_64_python3.8.____73_pypy + linux_64_python3.12.____cpython - variant + variant @@ -89,10 +89,10 @@ Current build status - linux_aarch64_python3.8.____73_pypy + linux_aarch64_python3.12.____cpython - variant + variant @@ -131,10 +131,10 @@ Current build status - linux_ppc64le_python3.8.____73_pypy + linux_ppc64le_python3.12.____cpython - variant + variant @@ -173,10 +173,10 @@ Current build status - osx_64_python3.8.____73_pypy + osx_64_python3.12.____cpython - variant + variant @@ -214,6 +214,13 @@ Current build status variant + + osx_arm64_python3.12.____cpython + + + variant + + osx_arm64_python3.8.____cpython @@ -243,10 +250,10 @@ Current build status - win_64_python3.8.____73_pypy + win_64_python3.12.____cpython - variant + variant