From 0beb2e1ab21d63414b6ef8604747e79d0ec3eac0 Mon Sep 17 00:00:00 2001 From: iarspider Date: Fri, 22 Oct 2021 18:36:56 +0200 Subject: Update py-aiohttp to 3.7.4 and py-chartdet to 4.0 (#26893) * Update py-aiohttp to 3.7.4 and py-chartdet to 4.0 * Changes from review * Update package.py * Update var/spack/repos/builtin/packages/py-chardet/package.py Co-authored-by: Adam J. Stewart Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-aiohttp/package.py | 4 ++++ var/spack/repos/builtin/packages/py-chardet/package.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-aiohttp/package.py b/var/spack/repos/builtin/packages/py-aiohttp/package.py index d0b2e0c717..4f63193a93 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp/package.py @@ -13,14 +13,18 @@ class PyAiohttp(PythonPackage): homepage = "https://github.com/aio-libs/aiohttp" url = "https://github.com/aio-libs/aiohttp/archive/v3.6.2.tar.gz" + version('3.7.4', sha256='d90ace66b55747e49531b13bf0a9c7ae9d1e14f315a56ea6b54c0dc1b6facd6e') version('3.6.2', sha256='4ad2d8393843ea0c7b50a93bf04fb1cf20b93c0a5e958de128efcd2e5f8adf80') depends_on('py-setuptools', type='build') depends_on('python@3.5.3:', type=('build', 'run')) + depends_on('python@3.6:', type=('build', 'run'), when='@3.7:') depends_on('py-attrs@17.3.0:', type=('build', 'run')) depends_on('py-chardet@2.0:3', type=('build', 'run')) depends_on('py-multidict@4.5:4', type=('build', 'run')) + depends_on('py-multidict@4.5:6', type=('build', 'run'), when='@3.6.3:') depends_on('py-async-timeout@3.0:3', type=('build', 'run')) depends_on('py-yarl@1.0:1', type=('build', 'run')) depends_on('py-idna-ssl@1.0:', type=('build', 'run'), when='^python@:3.6') depends_on('py-typing-extensions@3.6.5:', type=('build', 'run'), when='^python@:3.6') + depends_on('py-typing-extensions@3.6.5:', type=('build', 'run'), when='@3.7.1:') diff --git a/var/spack/repos/builtin/packages/py-chardet/package.py b/var/spack/repos/builtin/packages/py-chardet/package.py index 71f38e420b..614b15d450 100644 --- a/var/spack/repos/builtin/packages/py-chardet/package.py +++ b/var/spack/repos/builtin/packages/py-chardet/package.py @@ -12,9 +12,11 @@ class PyChardet(PythonPackage): homepage = "https://github.com/chardet/chardet" pypi = "chardet/chardet-3.0.4.tar.gz" + version('4.0.0', sha256='0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa') version('3.0.4', sha256='84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae') version('3.0.2', sha256='4f7832e7c583348a9eddd927ee8514b3bf717c061f57b21dbe7697211454d9bb') version('2.3.0', sha256='e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa') depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-pytest-runner', type='build') + depends_on('py-pytest-runner', type='build', when='@3.0.2') + depends_on('python@2.7:2.8,3.5:', when='@4:', type=('build', 'run')) -- cgit v1.2.3-60-g2f50