diff options
12 files changed, 35 insertions, 17 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 002280911c..5dbbe2860e 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -558,7 +558,7 @@ radiuss-protected-build: .radiuss-aws-overrides: # This controls image for generate step; build step is controlled by spack.yaml # Note that generator emits OS info for build so these should be the same. - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } .radiuss-aws: extends: [ ".linux_x86_64_v4" ] @@ -675,7 +675,7 @@ data-vis-sdk-protected-build: .aws-ahug-overrides: # This controls image for generate step; build step is controlled by spack.yaml # Note that generator emits OS info for build so these should be the same. - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } .aws-ahug: extends: [ ".linux_x86_64_v4" ] @@ -753,7 +753,7 @@ aws-ahug-aarch64-protected-build: .aws-isc-overrides: # This controls image for generate step; build step is controlled by spack.yaml # Note that generator emits OS info for build so these should be the same. - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } .aws-isc: extends: [ ".linux_x86_64_v4" ] @@ -871,7 +871,7 @@ tutorial-protected-build: .ml-linux-x86_64-cpu-generate: extends: [ .ml-linux-x86_64-cpu, ".tags-x86_64_v4" ] - image: ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21 + image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 ml-linux-x86_64-cpu-pr-generate: extends: [ ".pr-generate", ".ml-linux-x86_64-cpu-generate" ] @@ -911,7 +911,7 @@ ml-linux-x86_64-cpu-protected-build: .ml-linux-x86_64-cuda-generate: extends: [ .ml-linux-x86_64-cuda, ".tags-x86_64_v4" ] - image: ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21 + image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 ml-linux-x86_64-cuda-pr-generate: extends: [ ".pr-generate", ".ml-linux-x86_64-cuda-generate" ] @@ -951,7 +951,7 @@ ml-linux-x86_64-cuda-protected-build: .ml-linux-x86_64-rocm-generate: extends: [ .ml-linux-x86_64-rocm, ".tags-x86_64_v4" ] - image: ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21 + image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 ml-linux-x86_64-rocm-pr-generate: extends: [ ".pr-generate", ".ml-linux-x86_64-rocm-generate" ] diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml index 3bd3cce2fd..40917b600f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml @@ -231,7 +231,7 @@ spack: pipeline-gen: - build-job: image: - name: "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21" + name: "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09" entrypoint: [""] cdash: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug/spack.yaml index 82d2d0f344..6483e72b97 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug/spack.yaml @@ -228,7 +228,7 @@ spack: pipeline-gen: - build-job: image: - name: "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21" + name: "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09" entrypoint: [""] cdash: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml index a563421263..1c4e2de308 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml @@ -137,7 +137,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: AWS Packages diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml index 8e56d94709..0a898d1a75 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml @@ -148,7 +148,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: AWS Packages diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml index f4345a2bfa..0e4a9e7d90 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml @@ -85,7 +85,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: Machine Learning diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml index 6e9d2cff4e..6b0501b9bb 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml @@ -88,7 +88,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: Machine Learning diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml index df23bcdcfa..26946d9025 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml @@ -91,7 +91,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: Machine Learning diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml index 6fe36a2462..b05b45f763 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml @@ -43,7 +43,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: RADIUSS AWS Packages diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws/spack.yaml index c5d478fa94..5897828d6d 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws/spack.yaml @@ -48,7 +48,7 @@ spack: ci: pipeline-gen: - build-job: - image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2022-03-21", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } cdash: build-group: RADIUSS AWS Packages diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 0c27ef9c67..fcd264f95b 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -14,10 +14,11 @@ class PyCython(PythonPackage): version("3.0.0a9", sha256="23931c45877432097cef9de2db2dc66322cbc4fc3ebbb42c476bb2c768cecff0") version( - "0.29.32", - sha256="8733cf4758b79304f2a4e39ebfac5e92341bce47bcceb26c1254398b2f8c1af7", + "0.29.33", + sha256="5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a", preferred=True, ) + version("0.29.32", sha256="8733cf4758b79304f2a4e39ebfac5e92341bce47bcceb26c1254398b2f8c1af7") version("0.29.30", sha256="2235b62da8fe6fa8b99422c8e583f2fb95e143867d337b5c75e4b9a1a865f9e3") version("0.29.24", sha256="cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443") version("0.29.23", sha256="6a0d31452f0245daacb14c979c77e093eb1a546c760816b5eed0047686baad8e") @@ -41,6 +42,14 @@ class PyCython(PythonPackage): depends_on("python@2.7:2,3.4:", when="@3:", type=("build", "link", "run")) depends_on("python@2.6:2,3.3:", type=("build", "link", "run")) + + # https://github.com/cython/cython/commit/1cd24026e9cf6d63d539b359f8ba5155fd48ae21 + # collections.Iterable was removed in Python 3.10 + depends_on("python@:3.9", when="@:0.29.14", type=("build", "link", "run")) + + # https://github.com/cython/cython/commit/430e2ca220c8fed49604daf578df98aadb33a87d + depends_on("python@:3.8", when="@:0.29.13", type=("build", "link", "run")) + depends_on("py-setuptools", type=("build", "run")) depends_on("gdb@7.2:", type="test") diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py index 58642c160d..c5b59423fb 100644 --- a/var/spack/repos/builtin/packages/py-gevent/package.py +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -39,6 +39,15 @@ class PyGevent(PythonPackage): # Deprecated compiler options. upstream PR: https://github.com/gevent/gevent/pull/1896 patch("icc.patch", when="%intel") + @run_before("install") + def recythonize(self): + # Clean pre-generated cython files -- we've seen issues with Python 3.8 due to + # an old cython that was used to generate the C sources. + # On top of that, they specify a prerequisite on a file in cython's prefix, + # meaning that cython runs again depending on whether it was installed before e.g. + # 2020... So, just clean and re-run from scratch instead. + python("setup.py", "clean") + def flag_handler(self, name, flags): if name == "cflags": if self.spec.satisfies("%oneapi@2023:"): |