diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-07-04 20:33:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 20:33:47 +0200 |
| commit | d35149d1742f69bce44577fa848dad01f1b108d9 (patch) | |
| tree | 5024adba7a2fdc91238780105c686f174c833e18 | |
| parent | a3d11a79731d822be74129c4a280d661cac4b5cc (diff) | |
| download | spack-d35149d1742f69bce44577fa848dad01f1b108d9.tar.gz spack-d35149d1742f69bce44577fa848dad01f1b108d9.tar.bz2 spack-d35149d1742f69bce44577fa848dad01f1b108d9.tar.xz spack-d35149d1742f69bce44577fa848dad01f1b108d9.zip | |
remove another Python 3.7 requirement & preference, since it was deprecated (#38710)
4 files changed, 22 insertions, 26 deletions
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 diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 8d6cba7fee..eb991c42ae 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -310,6 +310,10 @@ class Python(Package): # https://bugs.python.org/issue45405 conflicts("@:3.7.2,3.8.0:3.8.12,3.9.0:3.9.10,3.10.0:3.10.2", when="%apple-clang@13:") + # See https://github.com/python/cpython/issues/106424 + # datetime.now(timezone.utc) segfaults + conflicts("@3.9:", when="%oneapi@2022.2.1:") + # Used to cache various attributes that are expensive to compute _config_vars: Dict[str, Dict[str, str]] = {} |