diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2019-12-24 17:37:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 17:37:03 -0800 |
| commit | 61b4ad18374756a261ccd6baccb60990fe04da21 (patch) | |
| tree | bc8adb3eda4ab9ab3d56a30e29f3958efa54ccef /lib | |
| parent | d333e147214b513ef8d96e1987d3785a6feb5e1f (diff) | |
| download | spack-61b4ad18374756a261ccd6baccb60990fe04da21.tar.gz spack-61b4ad18374756a261ccd6baccb60990fe04da21.tar.bz2 spack-61b4ad18374756a261ccd6baccb60990fe04da21.tar.xz spack-61b4ad18374756a261ccd6baccb60990fe04da21.zip | |
tests: finish removing pyqver from the repository (#14294)
Remove a few remaining mentions of the pyqver package, which was removed in #14289.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/external/_pytest/pytester.py | 2 | ||||
| -rw-r--r-- | lib/spack/external/ruamel/yaml/compat.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/external/_pytest/pytester.py b/lib/spack/external/_pytest/pytester.py index 2db85dff22..82aa00e0d2 100644 --- a/lib/spack/external/_pytest/pytester.py +++ b/lib/spack/external/_pytest/pytester.py @@ -569,7 +569,7 @@ class Testdir: def _possibly_invalidate_import_caches(self): # invalidate caches if we can (py33 and above) try: - import importlib # nopyqver + import importlib except ImportError: pass else: diff --git a/lib/spack/external/ruamel/yaml/compat.py b/lib/spack/external/ruamel/yaml/compat.py index 6eee151c51..a1778bef28 100644 --- a/lib/spack/external/ruamel/yaml/compat.py +++ b/lib/spack/external/ruamel/yaml/compat.py @@ -12,7 +12,7 @@ try: from ruamel.ordereddict import ordereddict except: try: - from collections import OrderedDict # nopyqver + from collections import OrderedDict except ImportError: from ordereddict import OrderedDict # to get the right name import ... as ordereddict doesn't do that |