Commit c12aab1e authored by iv's avatar iv

Add virtualenv ebuild, manifest, patches.

parent 9a49a8aa
...@@ -29,5 +29,9 @@ Original: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/flask/flask ...@@ -29,5 +29,9 @@ Original: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/flask/flask
## Existing ebuilds ## Existing ebuilds
Original: https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild Original: https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild
# virtualenv
## Existing ebuilds
Original: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild (modified)
# TODO # TODO
- it could be nice to create our own portage overlay instead of adding to Chromium OS's one - it could be nice to create our own portage overlay instead of adding to Chromium OS's one
\ No newline at end of file
DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161
--- pypa-virtualenv-350c45d/setup.py
+++ pypa-virtualenv-350c45d/setup.py
@@ -9,7 +9,6 @@
'entry_points': {
'console_scripts': [
'virtualenv=virtualenv:main',
- 'virtualenv-%s.%s=virtualenv:main' % sys.version_info[:2]
],
},
'zip_safe': False,
--- virtualenv-12.1.1/tests/test_virtualenv.py
+++ virtualenv-12.1.1/tests/test_virtualenv.py
@@ -6,6 +6,7 @@
import tempfile
import pytest
import platform # noqa
+import unittest
from mock import patch, Mock
@@ -126,7 +127,7 @@
shutil.rmtree(tmp_virtualenv)
-@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
+@unittest.skip("Running create environment while testing is broken")
def test_always_copy_option():
"""Should be no symlinks in directory tree"""
tmp_virtualenv = tempfile.mkdtemp()
docs/changes.rst | 3 ++
virtualenv.py | 92 +++++++++++++++++++++++++++++---------------------------
2 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/docs/changes.rst b/docs/changes.rst
index 80c3dc1..1d9c1fe 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,6 +1,9 @@
Release History
===============
+* Remove virtualenv file's path from directory when executing with a new
+ python. Fixes issue #779, #763 (PR #805)
+
13.1.2 (2015-08-23)
~~~~~~~~~~~~~~~~~~~
diff --git a/virtualenv.py b/virtualenv.py
index da25205..64e70d4 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -5,9 +5,22 @@
__version__ = "13.1.2"
virtualenv_version = __version__ # legacy
-import base64
-import sys
import os
+import sys
+
+# If we are running in a new interpreter to create a virtualenv,
+# we do NOT want paths from our existing location interfering with anything,
+# So we remove this file's directory from sys.path - most likely to be
+# the previous interpreter's site-packages. Solves #705, #763, #779
+if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
+ del_paths = []
+ for path in sys.path:
+ if os.path.realpath(os.path.dirname(__file__)) == os.path.realpath(path):
+ del_paths.append(path)
+ for path in del_paths:
+ sys.path.remove(path)
+
+import base64
import codecs
import optparse
import re
@@ -23,6 +36,11 @@ import struct
import subprocess
import tarfile
+try:
+ import ConfigParser
+except ImportError:
+ import configparser as ConfigParser
+
if sys.version_info < (2, 6):
print('ERROR: %s' % sys.exc_info()[1])
print('ERROR: this script requires Python 2.6 or greater.')
@@ -33,11 +51,6 @@ try:
except NameError:
basestring = str
-try:
- import ConfigParser
-except ImportError:
- import configparser as ConfigParser
-
join = os.path.join
py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1])
@@ -1096,45 +1109,34 @@ def change_prefix(filename, dst_prefix):
def copy_required_modules(dst_prefix, symlink):
import imp
- # If we are running under -p, we need to remove the current
- # directory from sys.path temporarily here, so that we
- # definitely get the modules from the site directory of
- # the interpreter we are running under, not the one
- # virtualenv.py is installed under (which might lead to py2/py3
- # incompatibility issues)
- _prev_sys_path = sys.path
- if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
- sys.path = sys.path[1:]
- try:
- for modname in REQUIRED_MODULES:
- if modname in sys.builtin_module_names:
- logger.info("Ignoring built-in bootstrap module: %s" % modname)
- continue
- try:
- f, filename, _ = imp.find_module(modname)
- except ImportError:
- logger.info("Cannot import bootstrap module: %s" % modname)
+
+ for modname in REQUIRED_MODULES:
+ if modname in sys.builtin_module_names:
+ logger.info("Ignoring built-in bootstrap module: %s" % modname)
+ continue
+ try:
+ f, filename, _ = imp.find_module(modname)
+ except ImportError:
+ logger.info("Cannot import bootstrap module: %s" % modname)
+ else:
+ if f is not None:
+ f.close()
+ # special-case custom readline.so on OS X, but not for pypy:
+ if modname == 'readline' and sys.platform == 'darwin' and not (
+ is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
+ dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
+ elif modname == 'readline' and sys.platform == 'win32':
+ # special-case for Windows, where readline is not a
+ # standard module, though it may have been installed in
+ # site-packages by a third-party package
+ pass
else:
- if f is not None:
- f.close()
- # special-case custom readline.so on OS X, but not for pypy:
- if modname == 'readline' and sys.platform == 'darwin' and not (
- is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
- dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
- elif modname == 'readline' and sys.platform == 'win32':
- # special-case for Windows, where readline is not a
- # standard module, though it may have been installed in
- # site-packages by a third-party package
- pass
- else:
- dst_filename = change_prefix(filename, dst_prefix)
- copyfile(filename, dst_filename, symlink)
- if filename.endswith('.pyc'):
- pyfile = filename[:-1]
- if os.path.exists(pyfile):
- copyfile(pyfile, dst_filename[:-1], symlink)
- finally:
- sys.path = _prev_sys_path
+ dst_filename = change_prefix(filename, dst_prefix)
+ copyfile(filename, dst_filename, symlink)
+ if filename.endswith('.pyc'):
+ pyfile = filename[:-1]
+ if os.path.exists(pyfile):
+ copyfile(pyfile, dst_filename[:-1], symlink)
def subst_path(prefix_path, prefix, home_dir):
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
DESCRIPTION="Virtual Python Environment builder"
HOMEPAGE="
http://www.virtualenv.org/
https://pypi.python.org/pypi/virtualenv
https://github.com/pypa/virtualenv/
"
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="alpha amd64 arm arm64 x86"
SLOT="0"
RDEPEND=""
DEPEND="${RDEPEND}
dev-python/setuptools
"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
"${FILESDIR}"/${P}-PYTHONPATH-backport.patch
)
python_test() {
py.test -v -v || die "Tests fail with ${EPYTHON}"
}
python_install_all() {
distutils-r1_python_install_all
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment