diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index aa5f058..0d3f34f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_mpimpichpython3.10.____cpython: diff --git a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml index f5e4a03..0ea59bc 100644 --- a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml index 210b5e1..c178e75 100644 --- a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml index a506cda..6b05417 100644 --- a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml index 089a249..7e69fae 100644 --- a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml index e6efd86..d9a68c9 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml index 5a2aed0..cac0299 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml index fd48ebd..5af7e38 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml index 239d07c..e07bf95 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml @@ -35,9 +35,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/petsc322.yaml b/.ci_support/migrations/petsc322.yaml new file mode 100644 index 0000000..1e60766 --- /dev/null +++ b/.ci_support/migrations/petsc322.yaml @@ -0,0 +1,14 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for petsc 3.22 + kind: version + migration_number: 1 +migrator_ts: 1727625927.7062201 +petsc: +- '3.22' +slepc: +- '3.22' +petsc4py: +- '3.22' +slepc4py: +- '3.22' diff --git a/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml index f74d9f6..9d7f67e 100644 --- a/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpimpichpython3.11.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.11.____cpython.yaml index 5d605df..7fcbbeb 100644 --- a/.ci_support/osx_64_mpimpichpython3.11.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.11.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpimpichpython3.12.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.12.____cpython.yaml index eb817d5..dd35555 100644 --- a/.ci_support/osx_64_mpimpichpython3.12.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.12.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml index 70e2095..b6fc31b 100644 --- a/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml index ae08e6b..f3300a4 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpiopenmpipython3.11.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.11.____cpython.yaml index 5d47e60..b075624 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.11.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.11.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpiopenmpipython3.12.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.12.____cpython.yaml index 4b97145..8392432 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.12.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.12.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml index eba6da8..30c9eea 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml @@ -37,9 +37,9 @@ openblas: openmpi: - '5' petsc: -- '3.21' +- '3.22' petsc4py: -- '3.21' +- '3.22' pin_run_as_build: python: min_pin: x.x diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..67d82fa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54bd538..71ced89 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "proteus" %} {% set version = "1.8.3" %} -{% set build = 2 %} +{% set build = 3 %} {% set sha256 = "315f0600044e2ad86592c248a9a4ca87dc58c1d678af2c27a9ddde802b555618" %} package: