|
 |
25ffd0 |
diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
|
|
|
25ffd0 |
index ce45ede..7946a16 100644
|
|
|
25ffd0 |
--- a/tests/test_virtualenv.py
|
|
|
25ffd0 |
+++ b/tests/test_virtualenv.py
|
|
|
25ffd0 |
@@ -4,11 +4,16 @@ import os
|
|
|
25ffd0 |
import shutil
|
|
|
25ffd0 |
import sys
|
|
|
25ffd0 |
import tempfile
|
|
|
25ffd0 |
+import zipfile
|
|
|
25ffd0 |
import pytest
|
|
|
25ffd0 |
import platform # noqa
|
|
|
25ffd0 |
|
|
|
25ffd0 |
from mock import patch, Mock
|
|
|
25ffd0 |
|
|
|
25ffd0 |
+try:
|
|
|
25ffd0 |
+ from pathlib import Path
|
|
|
25ffd0 |
+except ImportError:
|
|
|
25ffd0 |
+ from pathlib2 import Path
|
|
|
25ffd0 |
|
|
|
25ffd0 |
def test_version():
|
|
|
25ffd0 |
"""Should have a version string"""
|
|
|
25ffd0 |
@@ -139,3 +144,44 @@ def test_always_copy_option():
|
|
|
25ffd0 |
" symlink (to %s)" % (full_name, os.readlink(full_name))
|
|
|
25ffd0 |
finally:
|
|
|
25ffd0 |
shutil.rmtree(tmp_virtualenv)
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+def test_missing_certifi_pem(tmp_path):
|
|
|
25ffd0 |
+ """Make sure that we can still create virtual environment if pip is
|
|
|
25ffd0 |
+ patched to not use certifi's cacert.pem and the file is removed.
|
|
|
25ffd0 |
+ This can happen if pip is packaged by Linux distributions."""
|
|
|
25ffd0 |
+ proj_dir = Path(__file__).parent.parent
|
|
|
25ffd0 |
+ support_original = proj_dir / "virtualenv_support"
|
|
|
25ffd0 |
+ pip_wheel = sorted(support_original.glob("pip*whl"))[0]
|
|
|
25ffd0 |
+ whl_name = pip_wheel.name
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+ wheeldir = tmp_path / "wheels"
|
|
|
25ffd0 |
+ wheeldir.mkdir()
|
|
|
25ffd0 |
+ tmpcert = tmp_path / "tmpcert.pem"
|
|
|
25ffd0 |
+ cacert = "pip/_vendor/requests/cacert.pem"
|
|
|
25ffd0 |
+ certifi = "pip/_vendor/requests/certs.py"
|
|
|
25ffd0 |
+ oldpath = b"os.path.join(os.path.dirname(__file__), 'cacert.pem')"
|
|
|
25ffd0 |
+ newpath = "r'{}'".format(tmpcert).encode()
|
|
|
25ffd0 |
+ removed = False
|
|
|
25ffd0 |
+ replaced = False
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+ with zipfile.ZipFile(str(pip_wheel), "r") as whlin:
|
|
|
25ffd0 |
+ with zipfile.ZipFile(str(wheeldir / whl_name), "w") as whlout:
|
|
|
25ffd0 |
+ for item in whlin.infolist():
|
|
|
25ffd0 |
+ buff = whlin.read(item.filename)
|
|
|
25ffd0 |
+ if item.filename == cacert:
|
|
|
25ffd0 |
+ tmpcert.write_bytes(buff)
|
|
|
25ffd0 |
+ removed = True
|
|
|
25ffd0 |
+ continue
|
|
|
25ffd0 |
+ if item.filename == certifi:
|
|
|
25ffd0 |
+ nbuff = buff.replace(oldpath, newpath)
|
|
|
25ffd0 |
+ assert nbuff != buff
|
|
|
25ffd0 |
+ buff = nbuff
|
|
|
25ffd0 |
+ replaced = True
|
|
|
25ffd0 |
+ whlout.writestr(item, buff)
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+ assert removed and replaced
|
|
|
25ffd0 |
+
|
|
|
25ffd0 |
+ venvdir = tmp_path / "venv"
|
|
|
25ffd0 |
+ search_dirs = [str(wheeldir), str(support_original)]
|
|
|
25ffd0 |
+ virtualenv.create_environment(str(venvdir), search_dirs=search_dirs)
|
|
|
25ffd0 |
diff --git a/virtualenv.egg-info/PKG-INFO b/virtualenv.egg-info/PKG-INFO
|
|
|
25ffd0 |
index 11f5c75..501e81a 100644
|
|
|
25ffd0 |
--- a/virtualenv.egg-info/PKG-INFO
|
|
|
25ffd0 |
+++ b/virtualenv.egg-info/PKG-INFO
|
|
|
25ffd0 |
@@ -1,10 +1,12 @@
|
|
|
25ffd0 |
-Metadata-Version: 1.1
|
|
|
25ffd0 |
+Metadata-Version: 1.2
|
|
|
25ffd0 |
Name: virtualenv
|
|
|
25ffd0 |
Version: 15.1.0
|
|
|
25ffd0 |
Summary: Virtual Python Environment builder
|
|
|
25ffd0 |
Home-page: https://virtualenv.pypa.io/
|
|
|
25ffd0 |
-Author: Jannis Leidel, Carl Meyer and Brian Rosner
|
|
|
25ffd0 |
-Author-email: python-virtualenv@groups.google.com
|
|
|
25ffd0 |
+Author: Ian Bicking
|
|
|
25ffd0 |
+Author-email: ianb@colorstudy.com
|
|
|
25ffd0 |
+Maintainer: Jannis Leidel, Carl Meyer and Brian Rosner
|
|
|
25ffd0 |
+Maintainer-email: python-virtualenv@groups.google.com
|
|
|
25ffd0 |
License: MIT
|
|
|
25ffd0 |
Description: Virtualenv
|
|
|
25ffd0 |
==========
|
|
|
25ffd0 |
diff --git a/virtualenv.py b/virtualenv.py
|
|
|
25ffd0 |
index a174b8a..5699998 100755
|
|
|
25ffd0 |
--- a/virtualenv.py
|
|
|
25ffd0 |
+++ b/virtualenv.py
|
|
|
25ffd0 |
@@ -861,7 +861,10 @@ def install_wheel(project_names, py_executable, search_dirs=None,
|
|
|
25ffd0 |
|
|
|
25ffd0 |
import pip
|
|
|
25ffd0 |
|
|
|
25ffd0 |
- cert_data = pkgutil.get_data("pip._vendor.requests", "cacert.pem")
|
|
|
25ffd0 |
+ try:
|
|
|
25ffd0 |
+ cert_data = pkgutil.get_data("pip._vendor.requests", "cacert.pem")
|
|
|
25ffd0 |
+ except IOError:
|
|
|
25ffd0 |
+ cert_data = None
|
|
|
25ffd0 |
if cert_data is not None:
|
|
|
25ffd0 |
cert_file = tempfile.NamedTemporaryFile(delete=False)
|
|
|
25ffd0 |
cert_file.write(cert_data)
|