From 98cdd616ca8541fadd9282dc60157679d77e1fd5 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 3 Oct 2018 19:33:22 -0700 Subject: py-flake8: enum34 not required for python 3.4 and up (#9415) py-flake8 only requires py-enum34 when using a python version earlier than 3.4 --- var/spack/repos/builtin/packages/py-flake8/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index 81a5838956..7de8251b3a 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -69,7 +69,12 @@ class PyFlake8(PythonPackage): # depends_on('py-configparser', when='^python@:3.3', type=('build', 'run')) # depends_on('py-enum34', when='^python@:3.1', type=('build', 'run')) depends_on('py-configparser', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run')) + + # py-enum34 provides enum module from Python 3.4 for Python + # versions 2.4, 2.5, 2.6, 2.7, 3.1, 3.2, and 3.3; use built-in enum + # module for Python versions 3.4 and later + depends_on('py-enum34', when='^python@2.4:2.7.999,3.1:3.3.999', + type=('build', 'run')) depends_on('py-nose', type='test') -- cgit v1.2.3-70-g09d2