From 9c3063196fed1bcd13e2c00dc4bb5e59a08de0db Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:33:05 +0000 Subject: [PATCH 1/3] Rebuild for boost1780 --- .ci_support/migrations/boost1780.yaml | 9 +++++++++ recipe/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/boost1780.yaml diff --git a/.ci_support/migrations/boost1780.yaml b/.ci_support/migrations/boost1780.yaml new file mode 100644 index 0000000..9933373 --- /dev/null +++ b/.ci_support/migrations/boost1780.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 3 +boost: +- 1.78.0 +boost_cpp: +- 1.78.0 +migrator_ts: 1662825971 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 63af877..4fad6ef 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ build: skip: True # [osx] skip: True # [py<3] skip: True # [win] - number: 1 + number: 2 requirements: build: - {{ compiler('cxx') }} From 8fd6ed0b492900dd7bc93d245daa1dd29f6a3cf4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:33:32 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.12.04.26.16 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++-- .azure-pipelines/azure-pipelines-win.yml | 88 ------------------- ...ux_64_numpy1.19python3.7.____cpython.yaml} | 4 +- ...ux_64_numpy1.19python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.19python3.9.____cpython.yaml} | 4 +- ...x_64_numpy1.21python3.10.____cpython.yaml} | 22 +++-- .ci_support/win_64_python3.8.____cpython.yaml | 27 ------ .ci_support/win_64_python3.9.____cpython.yaml | 27 ------ README.md | 30 ++----- azure-pipelines.yml | 3 +- 10 files changed, 41 insertions(+), 184 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml rename .ci_support/{linux_64_python3.7.____cpython.yaml => linux_64_numpy1.19python3.7.____cpython.yaml} (96%) rename .ci_support/{linux_64_python3.8.____cpython.yaml => linux_64_numpy1.19python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_python3.9.____cpython.yaml => linux_64_numpy1.19python3.9.____cpython.yaml} (96%) rename .ci_support/{win_64_python3.7.____cpython.yaml => linux_64_numpy1.21python3.10.____cpython.yaml} (58%) delete mode 100644 .ci_support/win_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.9.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 16a1d32..79a0360 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython + linux_64_numpy1.19python3.7.____cpython: + CONFIG: linux_64_numpy1.19python3.7.____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 + linux_64_numpy1.19python3.8.____cpython: + CONFIG: linux_64_numpy1.19python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_numpy1.19python3.9.____cpython: + CONFIG: linux_64_numpy1.19python3.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 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 3d79cf9..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,88 +0,0 @@ -# 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 -*- - -jobs: -- job: win - pool: - vmImage: windows-2019 - strategy: - matrix: - win_64_python3.7.____cpython: - CONFIG: win_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - - steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - 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 - 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: - 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 diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.7.____cpython.yaml index 95fe5c0..4b2bb4e 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml @@ -1,7 +1,7 @@ boost: -- 1.74.0 +- 1.78.0 boost_cpp: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.8.____cpython.yaml index 3eceb55..581d387 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml @@ -1,7 +1,7 @@ boost: -- 1.74.0 +- 1.78.0 boost_cpp: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 5053eeb..a05e1e3 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ boost: -- 1.74.0 +- 1.78.0 boost_cpp: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml similarity index 58% rename from .ci_support/win_64_python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 8d53e1f..a23e3cc 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -1,15 +1,23 @@ boost: -- 1.74.0 +- 1.78.0 boost_cpp: -- 1.74.0 +- 1.78.0 +cdt_name: +- cos6 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +hdf5: +- 1.12.1 numpy: -- '1.19' +- '1.21' pin_run_as_build: boost: max_pin: x.x.x @@ -19,9 +27,11 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython +suitesparse: +- '5' target_platform: -- win-64 +- linux-64 zip_keys: - - python - numpy diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml deleted file mode 100644 index 6519bf1..0000000 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -boost: -- 1.74.0 -boost_cpp: -- 1.74.0 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -numpy: -- '1.19' -pin_run_as_build: - boost: - max_pin: x.x.x - boost-cpp: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml deleted file mode 100644 index 32ad1ad..0000000 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -boost: -- 1.74.0 -boost_cpp: -- 1.74.0 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -numpy: -- '1.19' -pin_run_as_build: - boost: - max_pin: x.x.x - boost-cpp: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/README.md b/README.md index 52a35fe..3a71fee 100644 --- a/README.md +++ b/README.md @@ -33,45 +33,31 @@ Current build status - + - + - + - + - - - - - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index baa1c2b..ad85a2c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,5 +3,4 @@ # -*- mode: yaml -*- jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file From a809fe16bc119364c36f35882716c0dc89d4e011 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 04:31:17 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.27.03.11.11 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++---- ...nux_64_numpy1.19python3.7.____cpython.yaml | 37 ------------------- ...ux_64_numpy1.20python3.8.____cpython.yaml} | 2 +- ...ux_64_numpy1.20python3.9.____cpython.yaml} | 2 +- README.md | 15 ++------ 5 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.19python3.7.____cpython.yaml rename .ci_support/{linux_64_numpy1.19python3.8.____cpython.yaml => linux_64_numpy1.20python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.19python3.9.____cpython.yaml => linux_64_numpy1.20python3.9.____cpython.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 79a0360..1a92ac8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.19python3.7.____cpython: - CONFIG: linux_64_numpy1.19python3.7.____cpython + linux_64_numpy1.20python3.8.____cpython: + CONFIG: linux_64_numpy1.20python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.8.____cpython: - CONFIG: linux_64_numpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.9.____cpython: - CONFIG: linux_64_numpy1.19python3.9.____cpython + 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: diff --git a/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml deleted file mode 100644 index 4b2bb4e..0000000 --- a/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -boost: -- 1.78.0 -boost_cpp: -- 1.78.0 -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -hdf5: -- 1.12.1 -numpy: -- '1.19' -pin_run_as_build: - boost: - max_pin: x.x.x - boost-cpp: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5' -target_platform: -- linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml index 581d387..e42259d 100644 --- a/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: hdf5: - 1.12.1 numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml index a05e1e3..ca35500 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: hdf5: - 1.12.1 numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/README.md b/README.md index 3a71fee..09e70ca 100644 --- a/README.md +++ b/README.md @@ -33,24 +33,17 @@ Current build status
VariantStatus
linux_64_python3.7.____cpythonlinux_64_numpy1.19python3.7.____cpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_numpy1.19python3.8.____cpython - variant + variant
linux_64_python3.9.____cpythonlinux_64_numpy1.19python3.9.____cpython - variant + variant
win_64_python3.7.____cpythonlinux_64_numpy1.21python3.10.____cpython - variant - -
win_64_python3.8.____cpython - - variant - -
win_64_python3.9.____cpython - - variant + variant
- + - + - - -
VariantStatus
linux_64_numpy1.19python3.7.____cpythonlinux_64_numpy1.20python3.8.____cpython - variant + variant
linux_64_numpy1.19python3.8.____cpythonlinux_64_numpy1.20python3.9.____cpython - variant - -
linux_64_numpy1.19python3.9.____cpython - - variant + variant