|
 |
7712960 |
diff --git a/tests.py b/tests.py
|
|
|
7712960 |
index 253cd6f..add5c06 100644
|
|
|
7712960 |
--- a/tests.py
|
|
|
7712960 |
+++ b/tests.py
|
|
|
7712960 |
@@ -91,13 +91,13 @@ class BaseTest(TestCase):
|
|
|
7712960 |
self.assertIsInstance(result, dict)
|
|
|
7712960 |
self.assertTrue(bool(result))
|
|
|
7712960 |
if result:
|
|
|
7712960 |
- self.assertIn(pack, [k.lower() for k in result.keys()])
|
|
|
7712960 |
+ self.assertIn(pack, [k.split(' (')[0].lower() for k in result.keys()])
|
|
|
7712960 |
|
|
|
7712960 |
def test_search_names(self):
|
|
|
7712960 |
pack = packages_for_tests[0].lower()
|
|
|
7712960 |
result = self.virtual_env_obj.search_names(pack)
|
|
|
7712960 |
self.assertIsInstance(result, list)
|
|
|
7712960 |
- self.assertIn(pack, [k.lower() for k in result])
|
|
|
7712960 |
+ self.assertIn(pack, [k.split(' (')[0].lower() for k in result])
|
|
|
7712960 |
|
|
|
7712960 |
def tearDown(self):
|
|
|
7712960 |
if os.path.exists(self.env_path) and self.__class__.env_path is None:
|
|
|
7712960 |
diff --git a/virtualenvapi/manage.py b/virtualenvapi/manage.py
|
|
|
7712960 |
index d834be7..53e00ac 100644
|
|
|
7712960 |
--- a/virtualenvapi/manage.py
|
|
|
7712960 |
+++ b/virtualenvapi/manage.py
|
|
|
7712960 |
@@ -44,6 +44,16 @@ class VirtualEnvironment(object):
|
|
|
7712960 |
return os.path.join('bin', 'pip')
|
|
|
7712960 |
|
|
|
7712960 |
@property
|
|
|
7712960 |
+ def pip_version(self):
|
|
|
7712960 |
+ """Version of installed pip."""
|
|
|
7712960 |
+ if not self._pip_exists:
|
|
|
7712960 |
+ return None
|
|
|
7712960 |
+ if not hasattr(self, '_pip_version'):
|
|
|
7712960 |
+ string_version = self._execute([self._pip_rpath, '-V']).split()[1]
|
|
|
7712960 |
+ self._pip_version = tuple([int(n) for n in string_version.split('.')])
|
|
|
7712960 |
+ return self._pip_version
|
|
|
7712960 |
+
|
|
|
7712960 |
+ @property
|
|
|
7712960 |
def root(self):
|
|
|
7712960 |
"""The root directory that this virtual environment exists in."""
|
|
|
7712960 |
return os.path.split(self.path)[0]
|
|
|
7712960 |
@@ -270,10 +280,12 @@ class VirtualEnvironment(object):
|
|
|
7712960 |
def installed_packages(self):
|
|
|
7712960 |
"""
|
|
|
7712960 |
List of all packages that are installed in this environment in
|
|
|
7712960 |
- the format [(name, ver), ..].
|
|
|
7712960 |
+ the format [(name, ver), ..]. wheel is excluded from freeze output
|
|
|
7712960 |
+ in pip version >= 8.1.0 if --all option is not specified.
|
|
|
7712960 |
"""
|
|
|
7712960 |
+ freeze_options = ['-l', '--all'] if self.pip_version >= (8, 1, 0) else ['-l']
|
|
|
7712960 |
return list(map(split_package_name, filter(None, self._execute(
|
|
|
7712960 |
- [self._pip_rpath, 'freeze', '-l']).split(linesep))))
|
|
|
7712960 |
+ [self._pip_rpath, 'freeze'] + freeze_options).split(linesep))))
|
|
|
7712960 |
|
|
|
7712960 |
@property
|
|
|
7712960 |
def installed_package_names(self):
|