From c06aaebefdffc0d8e0a560377a82820bb1bdbad5 Mon Sep 17 00:00:00 2001 From: Enrico Usai <10634438+enrico-usai@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:53:28 +0100 Subject: Fix pyyaml dependency conflicts (#28177) For versions of aws-parallelcluster >= 2.9, the pyyaml dependency had to be >= 5.3.1 and == 5.1.2 at the same time making impossible to install ParallelCluster >= 2.9 from spack repository. See issue: https://github.com/spack/spack/issues/28172 Fixed by limiting pyyaml 5.1.2 version to aws-parallelcluster < 2.8, according to this commit: https://github.com/aws/aws-parallelcluster/commit/7255d314b7dfc186fc44afdb42aa6e9b1fae39e7 Tested with a manual installation of aws-parallelcluster@2.11.4 --- .../repos/builtin/packages/aws-parallelcluster/package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py index f1f8df2269..76cb3aa0e0 100644 --- a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py +++ b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py @@ -53,8 +53,11 @@ class AwsParallelcluster(PythonPackage): depends_on('py-tabulate@0.8.5', when='@2.9: ^python@3.0:3.4', type=('build', 'run')) depends_on('py-tabulate@0.8.2:0.8.7', when='@2.9: ^python@:2,3.5:', type=('build', 'run')) - depends_on('py-pyyaml@5.2', when='@2.6:2.8 ^python@3.0:3.4', type=('build', 'run')) - depends_on('py-pyyaml@5.3.1:', when='@2.9: ^python@:2,3.5:', type=('build', 'run')) + depends_on('py-pyyaml@5.3.1:', when='@2.11:', type=('build', 'run')) + depends_on('py-pyyaml@5.3.1:', when='@2.9:2.10 ^python@:2,3.5:', type=('build', 'run')) + depends_on('py-pyyaml@5.2', when='@2.6:2.10 ^python@3.0:3.4', type=('build', 'run')) + depends_on('py-pyyaml@5.1.2:', when='@2.6:2.8 ^python@:2,3.5:', type=('build', 'run')) + depends_on('py-pyyaml@5.1.2:', when='@:2.5', type=('build', 'run')) depends_on('py-jinja2@2.10.1', when='@2.9: ^python@3.0:3.4', type=('build', 'run')) depends_on('py-jinja2@2.11.0:', when='@2.9: ^python@:2,3.5:', type=('build', 'run')) @@ -67,9 +70,6 @@ class AwsParallelcluster(PythonPackage): depends_on('py-enum34@1.1.6:', when='^python@:3.3', type=('build', 'run')) - depends_on('py-pyyaml@5.1.2', when='@2.6: ^python@:2,3.5:', type=('build', 'run')) - depends_on('py-pyyaml@5.1.2:', when='@:2.5', type=('build', 'run')) - # https://github.com/aws/aws-parallelcluster/pull/1633 patch('enum34.patch', when='@:2.5.1') -- cgit v1.2.3-70-g09d2