From 30547f60d143d611ba8e84d18f92c6d025820dd4 Mon Sep 17 00:00:00 2001 From: Sebastian Schmitt Date: Thu, 27 May 2021 19:44:26 +0200 Subject: Update py-pint and fix runtime dependency on setuptools (#23950) * Update py-pint and fix runtime dependency on setuptools Without the runtime dependency on setuptools, importing pint yields: 0.11: ModuleNotFoundError: No module named 'pkg_resources' 0.17: ModuleNotFoundError: No module named 'packaging' * Fix * Address comments --- var/spack/repos/builtin/packages/py-pint/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py index 0b7f1803f3..ade1726835 100644 --- a/var/spack/repos/builtin/packages/py-pint/package.py +++ b/var/spack/repos/builtin/packages/py-pint/package.py @@ -18,6 +18,7 @@ class PyPint(PythonPackage): # any import tests for this package. import_modules = [] + version('0.17', sha256='f4d0caa713239e6847a7c6eefe2427358566451fe56497d533f21fb590a3f313') version('0.11', sha256='308f1070500e102f83b6adfca6db53debfce2ffc5d3cbe3f6c367da359b5cf4d') version('0.10.1', sha256='d739c364b8326fe3d70773d5720fa8b005ea6158695cad042677a588480c86e6') version('0.10', sha256='38a4d6e242b8bab693cd83a5f5ade3d816463b498658e7ab14ce64c4d458c88b') @@ -25,5 +26,8 @@ class PyPint(PythonPackage): version('0.8.1', sha256='afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4') depends_on('python@3.6:', type=('build', 'run'), when='@0.10:') - depends_on('py-setuptools', type=('build', )) - depends_on('py-setuptools-scm', type=('build', )) + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools-scm', type=('build')) + depends_on('py-packaging', type=('build', 'run'), when='@0.17:') + depends_on('py-importlib-metadata', type=('build', 'run'), when='@0.17: ^python@:3.7.999') + depends_on('py-importlib-resources', type=('build', 'run'), when='@0.17: ^python@:3.6.999') -- cgit v1.2.3-70-g09d2