From 61b4ad18374756a261ccd6baccb60990fe04da21 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Tue, 24 Dec 2019 17:37:03 -0800
Subject: [PATCH] tests: finish removing pyqver from the repository (#14294)

Remove a few remaining mentions of the pyqver package, which was removed in #14289.
---
 COPYRIGHT                                | 4 ----
 lib/spack/external/_pytest/pytester.py   | 2 +-
 lib/spack/external/ruamel/yaml/compat.py | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index ba792d2a9f..ae21fe54bd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -68,10 +68,6 @@ PackageName: py
 PackageHomePage: https://pypi.python.org/pypi/py
 PackageLicenseDeclared: MIT
 
-PackageName: pyqver
-PackageHomePage: https://github.com/ghewgill/pyqver
-PackageLicenseDeclared: BSD-3-Clause
-
 PackageName: pytest
 PackageHomePage: https://pypi.python.org/pypi/pytest
 PackageLicenseDeclared: MIT
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 @@ def syspathinsert(self, path=None):
     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 @@
     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