summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGeoffrey Oxberry <goxberry@gmail.com>2018-10-03 19:33:22 -0700
committerPeter Scheibel <scheibel1@llnl.gov>2018-10-03 19:33:22 -0700
commit98cdd616ca8541fadd9282dc60157679d77e1fd5 (patch)
tree229f57ee0cb4965fef7001b911a7e69707172da6 /var
parent479e71a83240e8e34d94c3d60bc8a5d69945a275 (diff)
downloadspack-98cdd616ca8541fadd9282dc60157679d77e1fd5.tar.gz
spack-98cdd616ca8541fadd9282dc60157679d77e1fd5.tar.bz2
spack-98cdd616ca8541fadd9282dc60157679d77e1fd5.tar.xz
spack-98cdd616ca8541fadd9282dc60157679d77e1fd5.zip
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
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-flake8/package.py7
1 files changed, 6 insertions, 1 deletions
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')