fixes for Fedora

pypa · Jan 18, 2020 · addcd27 · addcd27
1 parent f4eb740
commit addcd27
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/virtualenv/info.py b/src/virtualenv/info.py
@@ -45,7 +45,7 @@ def is_fs_case_sensitive():
         with tempfile.NamedTemporaryFile(prefix="TmP") as tmp_file:
             _FS_CASE_SENSITIVE = not os.path.exists(tmp_file.name.lower())
             logging.debug(
-                "filesystem under is %r%s case-sensitive", tmp_file.name, "" if _FS_CASE_SENSITIVE else " not"
+                "filesystem under %r is %scase-sensitive", tmp_file.name, "" if _FS_CASE_SENSITIVE else "not "
             )
     return _FS_CASE_SENSITIVE
 

diff --git a/src/virtualenv/interpreters/create/creator.py b/src/virtualenv/interpreters/create/creator.py
@@ -58,7 +58,7 @@ def platlib(self):
 
     @property
     def libs(self):
-        return list({self.platlib, self.purelib})
+        return list(OrderedDict(((self.platlib, None), (self.purelib, None))).keys())
 
     @property
     def stdlib(self):
@@ -203,6 +203,7 @@ def set_pyenv_cfg(self):
             "home": self.interpreter.system_exec_prefix,
             "include-system-site-packages": "true" if self.enable_system_site_package else "false",
             "implementation": self.interpreter.implementation,
+            "version_info": ".".join(str(i) for i in self.interpreter.version_info),
             "virtualenv": __version__,
         }
 

diff --git a/src/virtualenv/util/path/_permission.py b/src/virtualenv/util/path/_permission.py
@@ -13,7 +13,7 @@ def make_exe(filename):
                 mode |= level
             filename.chmod(mode)
             break
-        except PermissionError:
+        except OSError:
             continue
 
 

diff --git a/tests/unit/activation/test_python_activator.py b/tests/unit/activation/test_python_activator.py
@@ -84,7 +84,10 @@ def assert_output(self, out, raw, tmp_path):
 
             # sys path contains the site package at its start
             new_sys_path = out[5].split(os.path.pathsep)
-            assert ([six.ensure_text(str(i)) for i in [self._creator.purelib]] + prev_sys_path) == new_sys_path
+
+            new_lib_paths = {six.ensure_text(str(i)) for i in self._creator.libs}
+            assert prev_sys_path == new_sys_path[len(new_lib_paths) :]
+            assert new_lib_paths == set(new_sys_path[: len(new_lib_paths)])
 
             # manage to import from activate site package
             assert self.norm_path(out[6]) == self.norm_path(self._creator.purelib / "pydoc_test.py")