Skip to content

Commit 1213fd3

Browse files
committed
Spack in v0.20 end-of-lined package support for Python <3.7 and removed some "defunct" packages, which broke the packages included in the Chimbuko source. To fix this, I have imported the deprecated py-contextvars package (this module is part of Python 3.7+) from old Spack v0.19, and have removed Python <3.3 support from py-eventlet, which would require importing many more deprecated packages from the old Spack.
1 parent 20a7700 commit 1213fd3

6 files changed

Lines changed: 22 additions & 290 deletions

File tree

spack/repo/chimbuko/packages/binutils/cr16.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

spack/repo/chimbuko/packages/binutils/package.py

Lines changed: 0 additions & 158 deletions
This file was deleted.

spack/repo/chimbuko/packages/binutils/update_symbol-2.26.patch

Lines changed: 0 additions & 104 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other
2+
# Spack Project Developers. See the top-level COPYRIGHT file for details.
3+
#
4+
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
5+
6+
7+
from spack.package import *
8+
9+
10+
class PyContextvars(PythonPackage):
11+
"""This package implements a backport of Python 3.7 contextvars module
12+
(see PEP 567) for Python 3.6."""
13+
14+
homepage = "https://github.com/MagicStack/contextvars"
15+
pypi = "contextvars/contextvars-2.4.tar.gz"
16+
17+
version("2.4", sha256="f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e")
18+
19+
depends_on("py-setuptools", type="build")
20+
depends_on("py-immutables@0.9:", type=("build", "run"))
21+

spack/repo/chimbuko/packages/py-eventlet/package.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ class PyEventlet(PythonPackage):
1818
depends_on('py-greenlet@0.3:')
1919
depends_on('py-dnspython@1.15.0:1.16.0', type=('build', 'run') )
2020
depends_on('py-monotonic@1.4:', type=('build', 'run'), when='^python@:3.5')
21-
depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99')

spack/repo/chimbuko/packages/py-trio/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class PyTrio(PythonPackage):
3434
depends_on('py-outcome', type=('build', 'run'))
3535
depends_on('py-sniffio', type=('build', 'run'))
3636
depends_on('py-contextvars@2.1:', type=('build', 'run'),
37-
when='^python@:3.6.99')
37+
when='^python@:3.6')
3838

3939
extends('python')
4040

0 commit comments

Comments
 (0)