From d35149d1742f69bce44577fa848dad01f1b108d9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 4 Jul 2023 20:33:47 +0200 Subject: remove another Python 3.7 requirement & preference, since it was deprecated (#38710) --- .../gitlab/cloud_pipelines/configs/packages.yaml | 40 ++++++++++------------ .../cloud_pipelines/stacks/e4s-oneapi/spack.yaml | 2 -- .../cloud_pipelines/stacks/e4s-power/spack.yaml | 2 -- 3 files changed, 18 insertions(+), 26 deletions(-) (limited to 'share') diff --git a/share/spack/gitlab/cloud_pipelines/configs/packages.yaml b/share/spack/gitlab/cloud_pipelines/configs/packages.yaml index 067e60f4e4..1771f770c4 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/packages.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/packages.yaml @@ -1,23 +1,19 @@ -packages: - #all: - # CI should never build develop/main/master versions of - # packages. - # Current issues: - # - e4s/dav - # - hdf5-vol-async => argobot@main - # - aws-ahug-* - # - snap - # - tycho2 - # - amg2013 - # - cosp2 - # - snbone - # - vpfft - # - vpic - # - aws-isc-aarch64 - # - sse2neon - #require: "@:999999999" - python: - # This is redundant after https://github.com/spack/spack/pull/33898 - # but specified to allow the existance of a package.yaml for CI configs - require: "@3.7:" +packages: {} +# CI should never build develop/main/master versions of packages. Current issues: +# - e4s/dav +# - hdf5-vol-async => argobot@main +# - aws-ahug-* +# - snap +# - tycho2 +# - amg2013 +# - cosp2 +# - snbone +# - vpfft +# - vpic +# - aws-isc-aarch64 +# - sse2neon + +# packages: +# all: +# require: "@:999999999" \ No newline at end of file diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml index 7f20022065..62004d5986 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml @@ -41,8 +41,6 @@ spack: require: mpich mpich: require: '@4.1.1 ~wrapperrpath ~hwloc' - python: - require: '@3.7.15' py-cryptography: require: '@38.0.1' unzip: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml index 8515b409df..d138c63c35 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml @@ -30,8 +30,6 @@ spack: variants: threads=openmp paraview: require: '@5.11 ~qt+osmesa' - python: - version: [3.7.15] trilinos: require: - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack -- cgit v1.2.3-70-g09d2