From ceaad43e54ab2f49ae110663c82afb18ea692f46 Mon Sep 17 00:00:00 2001 From: Francesco Di Natale Date: Sat, 7 May 2022 18:28:23 -0700 Subject: [PATCH] Addition of 1.1.9dev version for py-maestrowf (#30523) * Addition of 1.1.9dev version. * Small style fix -- extra blank line. * Update var/spack/repos/builtin/packages/py-maestrowf/package.py Co-authored-by: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-maestrowf/package.py Co-authored-by: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-maestrowf/package.py Co-authored-by: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-maestrowf/package.py Co-authored-by: Adam J. Stewart * Additional dependencies and version constraints. * Revert to py-poetry. * Remove run from cryptography (build only). Co-authored-by: Adam J. Stewart --- .../builtin/packages/py-maestrowf/package.py | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index 7f2fd3909a..d8f08aab25 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -21,13 +21,15 @@ class PyMaestrowf(PythonPackage): version('develop', branch='develop') version('master', branch='master') + # Development versions + version('1.1.9dev1', tag='1.1.9dev1') + # Pre-release candidates version('1.1.7dev0', sha256='bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0') # pypi releases version('1.1.8', sha256='fa8f8eb8dd3adfb9646d7b0dfd498a00423d2131adbc8dbc8016c4159b2ec1d5', preferred=True) version('1.1.7', sha256='ff1b6696f30254b105fcadd297ad437c0c666ebc70124b231a713b89f47f4e94') - version('1.1.7dev0', sha256='bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0', url="https://pypi.io/packages/source/m/maestrowf/maestrowf-1.1.7.dev0.tar.gz") version('1.1.6', sha256='9812e67d9bd83c452cc99d82fbceb3017b5e36dafdf52eda939748bad4a88756') version('1.1.4', sha256='6603b93494e8e9d939a4ab40ecdfe7923a85960a8a8bddea4734e230d8144016') version('1.1.3', sha256='9812e67d9bd83c452cc99d82fbceb3017b5e36dafdf52eda939748bad4a88756') @@ -36,15 +38,18 @@ class PyMaestrowf(PythonPackage): version('1.1.0', sha256='1bfec546831f2ef577d7823bb50dcd12622644dad0d3d761998eafd0905b6977') version('1.0.1', sha256='dd42ffeac1f0492a576c630b37e5d3593273e59664407f2ebf78d49322d37146') - depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) - depends_on('py-setuptools', type='build') - depends_on('py-pyyaml@4.2b1:', type=('build', 'run')) - depends_on('py-six', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') - depends_on('py-enum34', type=('build', 'run'), when='@:1.1.3') - depends_on('py-tabulate', type=('build', 'run'), when='@1.1.0:') - depends_on('py-filelock', type=('build', 'run'), when='@1.1.0:') - depends_on('py-coloredlogs', type=('build', 'run'), when='@1.1.7:') - depends_on('py-chainmap', type=('build', 'run'), when='@1.1.7: ^python@:2') - depends_on('py-dill', type=('build', 'run'), when='@1.1.7:') - depends_on('py-jsonschema@3.2.0:', type=('build', 'run'), when='@1.1.7:') + depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) + depends_on('python@3.6:', type=('build', 'run'), when='@1.1.9:') + depends_on('py-setuptools', type=('build'), when='@:1.1.8') + depends_on('py-poetry@0.12:', type=('build'), when='@1.1.9:') + depends_on('py-cryptography@:2', type=('build')) + depends_on('py-pyyaml@4.2:', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') + depends_on('py-enum34', type=('build', 'run'), when='@:1.1.3') + depends_on('py-tabulate', type=('build', 'run'), when='@1.1.0:') + depends_on('py-filelock', type=('build', 'run'), when='@1.1.0:') + depends_on('py-coloredlogs', type=('build', 'run'), when='@1.1.7:') + depends_on('py-chainmap', type=('build', 'run'), when='@1.1.7: ^python@:2') + depends_on('py-dill', type=('build', 'run'), when='@1.1.7:') + depends_on('py-jsonschema@3.2.0:', type=('build', 'run'), when='@1.1.7:')