diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-19 20:09:13 -0800 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-19 20:09:13 -0800 |
commit | 53cb7e828bdfd83a99e44e2c36bdf9219b941143 (patch) | |
tree | 3e76458678f1121c33632912f54268e4912b23b6 /lib | |
parent | df5dc1c9bb29a56cc1cf6b4bce903b8d4f40b52e (diff) | |
parent | 3d3bea618e1e72c713794e82b9bb190d0ebf8624 (diff) | |
download | spack-53cb7e828bdfd83a99e44e2c36bdf9219b941143.tar.gz spack-53cb7e828bdfd83a99e44e2c36bdf9219b941143.tar.bz2 spack-53cb7e828bdfd83a99e44e2c36bdf9219b941143.tar.xz spack-53cb7e828bdfd83a99e44e2c36bdf9219b941143.zip |
Merge branch 'pull/256' into develop
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/spack/external/pyqver2.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/test/python_version.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/spack/external/pyqver2.py b/lib/spack/external/pyqver2.py index 4a16e2811e..4690239748 100755 --- a/lib/spack/external/pyqver2.py +++ b/lib/spack/external/pyqver2.py @@ -30,7 +30,8 @@ import sys StandardModules = { "__future__": (2, 1), "abc": (2, 6), - "argparse": (2, 7), +# skip argparse now that it's in lib/spack/external +# "argparse": (2, 7), "ast": (2, 6), "atexit": (2, 0), "bz2": (2, 3), diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py index ba570b416f..2ea5febb11 100644 --- a/lib/spack/spack/test/python_version.py +++ b/lib/spack/spack/test/python_version.py @@ -63,10 +63,6 @@ class PythonVersionTest(unittest.TestCase): all_issues = {} for fn in files: - if fn != '/Users/gamblin2/src/spack/var/spack/packages/vim/package.py': - continue - print fn - with open(fn) as pyfile: versions = pyqver2.get_versions(pyfile.read()) for ver, reasons in versions.items(): |