* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2015-11-23 10:05 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-11-23 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 28ae481257f6f6b3b4302cba04e845091591dfe9
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 09:28:55 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 10:05:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ae4812
dev-python/virtualenv: Drop old
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/virtualenv/Manifest | 3 --
.../files/virtualenv-12.0-skip-broken-test.patch | 18 ---------
dev-python/virtualenv/virtualenv-12.0.5.ebuild | 45 ---------------------
dev-python/virtualenv/virtualenv-13.1.0.ebuild | 46 ----------------------
dev-python/virtualenv/virtualenv-13.1.1.ebuild | 46 ----------------------
5 files changed, 158 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0141f87..20ad85d 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
-DIST virtualenv-12.0.5.tar.gz 1805752 SHA256 ebb7a01e7fb7a9b3586692f623da4e13d50351f3733d8bbc83aaecd654c5f955 SHA512 b5fd46aa8a34f42d3db46c48ac751e5c22d8fcddc83edd4230838549d549ddfd47e56ef784677d8d17471ed2bbde168e3db6d48ca6a9c2d2ae757caac5768a10 WHIRLPOOL 6a0e568a9954473c6ab2b4f4d814ddd42a4c92d6543b3ec005bbd42d9c25a775dc421c5e8491269fc77fba6c37e8dea9773c644eaa44128b9f2bf7f0db6bdea0
-DIST virtualenv-13.1.0.tar.gz 1705046 SHA256 504e705d73251a7f248e0e88d9054a1b4baf5f276a237f8de0830fd0e1661d63 SHA512 9361b4a44e57c9e2d2138092b0f0b32f7d0209f383f5b0c5f001b2a4e5a886acdacee0317551f6e4722b7fc669604debdcaa50864285ff3326c34a2b9ecb13f4 WHIRLPOOL dc6ff2b2fca481686f56b7f719a417c6b8bd2f115284aa7cc2d6a3541434db107638be97aca51407f9bec819254972606bf57ec233909e86bbd9f7673e0e5936
-DIST virtualenv-13.1.1.tar.gz 1704689 SHA256 8ccd344a7410aca75fd95a342e7e8f941e780d117b259d80ac6220d71bdb8c22 SHA512 dc8bd7dd34961c7e85cb3b4f31e160dfc15403e8c91c59fa7f92b0271bc4c09181c2db803fe6ecb4234bfd5f0b60bb8cd64f0a195d8dcfebc7bb34bd4bc7487f WHIRLPOOL 4132729160683c851952cd65c0c52a4f7f885fc26ff763e41cc5f313d1d50fb2a561668121d273a5455cc275561feb89d23fc28f285c37db268175c2b775cf00
DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161
diff --git a/dev-python/virtualenv/files/virtualenv-12.0-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.0-skip-broken-test.patch
deleted file mode 100644
index a7485e4..0000000
--- a/dev-python/virtualenv/files/virtualenv-12.0-skip-broken-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- virtualenv-12.0/tests/test_virtualenv.py
-+++ virtualenv-12.0/tests/test_virtualenv.py
-@@ -5,6 +5,7 @@
- import sys
- import tempfile
- from mock import patch, Mock
-+import unittest
-
-
- def test_version():
-@@ -123,6 +124,7 @@
- shutil.rmtree(tmp_virtualenv)
-
-
-+@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()
diff --git a/dev-python/virtualenv/virtualenv-12.0.5.ebuild b/dev-python/virtualenv/virtualenv-12.0.5.ebuild
deleted file mode 100644
index c456703..0000000
--- a/dev-python/virtualenv/virtualenv-12.0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
- "${FILESDIR}"/${PN}-12.0-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
-
-python_test() {
- py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-13.1.0.ebuild b/dev-python/virtualenv/virtualenv-13.1.0.ebuild
deleted file mode 100644
index dcf3173..0000000
--- a/dev-python/virtualenv/virtualenv-13.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-13.1.1.ebuild b/dev-python/virtualenv/virtualenv-13.1.1.ebuild
deleted file mode 100644
index de7ef3f..0000000
--- a/dev-python/virtualenv/virtualenv-13.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -vvx || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2016-01-17 15:23 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2016-01-17 15:23 UTC (permalink / raw
To: gentoo-commits
commit: e0b3f694ceda2d7220431ee7b27011877bbd3230
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 15:23:04 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 15:23:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b3f694
dev-python/virtualenv: Backport fix for python3.5
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=571172
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../virtualenv-13.1.2-PYTHONPATH-backport.patch | 144 +++++++++++++++++++++
dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild | 52 ++++++++
2 files changed, 196 insertions(+)
diff --git a/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
new file mode 100644
index 0000000..0e48643
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
@@ -0,0 +1,144 @@
+ 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):
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
new file mode 100644
index 0000000..13c85a3
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+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_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test -v -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2017-05-03 7:37 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-05-03 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 737af3adb605a631938fb9f1bd5472cc492da6db
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 06:25:47 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 3 07:37:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737af3ad
dev-python/virtualenv: Clean old versions up
dev-python/virtualenv/Manifest | 3 -
.../virtualenv-1.8.2-no-versioned-script.patch | 10 --
.../virtualenv-13.1.2-PYTHONPATH-backport.patch | 144 ---------------------
dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild | 51 --------
dev-python/virtualenv/virtualenv-13.1.2.ebuild | 50 -------
dev-python/virtualenv/virtualenv-14.0.6.ebuild | 50 -------
dev-python/virtualenv/virtualenv-15.0.3.ebuild | 49 -------
7 files changed, 357 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 033ccfd7969..8979565d437 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
-DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161
-DIST virtualenv-14.0.6.tar.gz 1799312 SHA256 ce61e5d05e3532a8d910663c5ab92ed4c226c3daaba903f1ada281d96fabec98 SHA512 86fae16be973c8a981b106b22fec74909de225b70b7a486108ae769385a573087d64beb8963373f35a444a9baf0a1805c0035313f600655629dd8a03850c51fb WHIRLPOOL f4891ac11d2d2ca889e6b2eea4256c8f8628a59e205a20c022e050e37d3baebde221dcbb02fae7cdeb8d088d1dad30734a1471d37b658b7f13c3895287bc4769
-DIST virtualenv-15.0.3.tar.gz 1847120 SHA256 8b230f01701eee0bfa45a7dc6ff19397abd92c3d50728f08e2236754797fdc01 SHA512 2d7223d59062dae7da8e81ca0463e4dd526faee01b48d2c42e39d7ada328a819e454a96c2380c200dba434f62a7cb1c612eff13815306837f2362bc5e658bae0 WHIRLPOOL c4c4539b44e05f234bd6fdfbb6568159a5b55edfd81e4920dbb4f1606dd8e77f5696c818afa8e1bc4eac28600303a5b2da1418fb3e730c64c7c5489f912d4b68
DIST virtualenv-15.1.0.tar.gz 1865011 SHA256 aea627d114a3863d6374c5a3fc3cdd08907e0ac951cf93b458e5ba5998c516de SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255 WHIRLPOOL de8dd66fdd004ad9c8e866eaa7bcd701b16b6f7c185ebe73a7681b3600ae4f55996b9f8e321ef51bf85046283a2e4bf948ffe2b10218190ecb334351f92c57b3
diff --git a/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch b/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch
deleted file mode 100644
index 040e36794ba..00000000000
--- a/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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,
diff --git a/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
deleted file mode 100644
index 0e48643a85c..00000000000
--- a/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
+++ /dev/null
@@ -1,144 +0,0 @@
- 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):
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
deleted file mode 100644
index 27d0e31afb5..00000000000
--- a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-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_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
deleted file mode 100644
index c97edc4ef1f..00000000000
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-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 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-14.0.6.ebuild b/dev-python/virtualenv/virtualenv-14.0.6.ebuild
deleted file mode 100644
index 9aa3400b392..00000000000
--- a/dev-python/virtualenv/virtualenv-14.0.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-15.0.3.ebuild b/dev-python/virtualenv/virtualenv-15.0.3.ebuild
deleted file mode 100644
index 833483ff7b2..00000000000
--- a/dev-python/virtualenv/virtualenv-15.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2020-05-28 8:00 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-05-28 8:00 UTC (permalink / raw
To: gentoo-commits
commit: 1f49fbe42e6def41260981fd420f2bbd471fa02b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 15:18:26 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 28 07:59:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f49fbe4
dev-python/virtualenv: Port to py39
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../virtualenv/files/virtualenv-20.0.21-py39.patch | 27 ++++++++++++++++++++++
dev-python/virtualenv/virtualenv-16.7.10.ebuild | 2 +-
dev-python/virtualenv/virtualenv-20.0.21.ebuild | 6 ++++-
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
new file mode 100644
index 00000000000..221cc734d26
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
@@ -0,0 +1,27 @@
+From a8717bf6ac3375d7f26738189c32e3bae04d280a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
+Date: Fri, 22 May 2020 12:41:32 +0100
+Subject: [PATCH] Add 3.9 on Linux to the test suite (#1839)
+
+---
+ azure-pipelines.yml | 10 ++++++----
+ setup.cfg | 3 ++-
+ tests/integration/test_zipapp.py | 2 ++
+ tests/unit/activation/test_xonsh.py | 3 +++
+ tests/unit/discovery/test_py_spec.py | 2 ++
+ tox.ini | 2 +-
+ 6 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/tests/unit/discovery/test_py_spec.py b/tests/unit/discovery/test_py_spec.py
+index 445412773..52154f14c 100644
+--- a/tests/unit/discovery/test_py_spec.py
++++ b/tests/unit/discovery/test_py_spec.py
+@@ -95,6 +95,8 @@ def _version_not_satisfies_pairs():
+ for o in [1, -1]:
+ temp = copy(sat_ver)
+ temp[patch] += o
++ if temp[patch] < 0:
++ continue
+ sat = ".".join(str(i) for i in temp)
+ target.add((req, sat))
+ return sorted(target)
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index 17e73c44a3f..72bbf587452 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
DISTUTILS_USE_SETUPTOOLS=manual
inherit distutils-r1
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
index a2cafd2f792..598bd3439d0 100644
--- a/dev-python/virtualenv/virtualenv-20.0.21.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
DISTUTILS_USE_SETUPTOOLS=manual
inherit distutils-r1
@@ -58,6 +58,10 @@ distutils_enable_sphinx docs \
dev-python/towncrier
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-py39.patch
+)
+
src_prepare() {
# we don't have xonsh
rm tests/unit/activation/test_xonsh.py || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2020-07-19 17:18 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-07-19 17:18 UTC (permalink / raw
To: gentoo-commits
commit: a12b4ca098a4bd5d5fe9f20fedb131cdb12f13bd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 16:48:49 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 17:17:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12b4ca0
dev-python/virtualenv: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/virtualenv/Manifest | 4 -
.../files/virtualenv-12.1.1-skip-broken-test.patch | 19 -----
dev-python/virtualenv/virtualenv-16.0.0.ebuild | 50 ------------
dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild | 62 ---------------
dev-python/virtualenv/virtualenv-20.0.23.ebuild | 91 ----------------------
dev-python/virtualenv/virtualenv-20.0.26.ebuild | 91 ----------------------
6 files changed, 317 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b3b81c3a197..97862e67947 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,6 +1,2 @@
-DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
-DIST virtualenv-20.0.26.tar.gz 8264088 BLAKE2B 0d5bfbae10fa7de73ec3766863415a5a8f6680b168ef4ef25984b91a9291645189b987bfc63b96897b6f421fd692b4a388eee7a36995b0b65fe52d3019813da4 SHA512 d81fa8f25b7752fbb76494cea62f76d5f40e1397853ef71c1eb8078ffe8748fb365f275cc34ef04f64a001e3300a6f26f872542f68c047bee1eeb74cd49180a7
DIST virtualenv-20.0.27.tar.gz 8265353 BLAKE2B 31e0a5fa11d988b5340b130615dc5095a61321393fdc4f72fd88e70d88bc7922c2f8f289b995fb623d2fe900a7da8f012433d4a7bb2ecd7ab53810865e05ea2b SHA512 812a17d1461c8e62568f345aba0722204dd22d0d149720d00e37712a34a9d2d614e1b854f07d7e89e1eb6e915ca3f90e8e81fb9c2442ed637efdc6b2120153d7
diff --git a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
deleted file mode 100644
index 5c14c3e2285..00000000000
--- a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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()
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
deleted file mode 100644
index 87a7b5e5be6..00000000000
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/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 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
deleted file mode 100644
index d6c847fb9ef..00000000000
--- a/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
- test? (
- >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pypiserver[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
- # disable tests that need internet access
- "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
- # test fixes for pypy
- "${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-
-python_test() {
- cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
- die "Could not copy LICENSE.txt with ${EPYTHON}"
-
- pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
deleted file mode 100644
index 6c1825d6e7d..00000000000
--- a/dev-python/virtualenv/virtualenv-20.0.23.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
- ' -2)
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
- ' -2 python3_{6,7} pypy3)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
- ' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/coverage[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- ' 'python3*')
- )"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-
-src_prepare() {
- # we don't have xonsh
- rm tests/unit/activation/test_xonsh.py || die
- # require internet
- sed -e 's:test_seed_link_via_app_data:_&:' \
- -i tests/unit/seed/test_boostrap_link_via_app_data.py || die
- # TODO: investigate
- sed -e 's:test_cross_major:_&:' \
- -i tests/unit/create/test_creator.py || die
- sed -e 's:test_py_info_to_system_raises:_&:' \
- -i tests/unit/discovery/py_info/test_py_info.py || die
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- # TODO: fix/skip with more granularity tests on pypy3
- if has "${EPYTHON}" pypy3 python2.7; then
- einfo "Skipping broken tests on pypy3"
- continue
- fi
-
- distutils_install_for_testing
-
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.26.ebuild b/dev-python/virtualenv/virtualenv-20.0.26.ebuild
deleted file mode 100644
index a8a3d84852f..00000000000
--- a/dev-python/virtualenv/virtualenv-20.0.26.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
- ' -2)
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
- ' -2 python3_{6,7} pypy3)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
- ' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- ' 'python3*')
- )"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-
-src_prepare() {
- # we don't have xonsh
- rm tests/unit/activation/test_xonsh.py || die
- # require internet
- sed -e 's:test_seed_link_via_app_data:_&:' \
- -i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
- # TODO: investigate
- sed -e 's:test_cross_major:_&:' \
- -i tests/unit/create/test_creator.py || die
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- # TODO: fix/skip with more granularity tests on pypy3
- if has "${EPYTHON}" pypy3 python2.7; then
- einfo "Skipping broken tests on pypy3"
- continue
- fi
-
- distutils_install_for_testing
-
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2021-10-23 11:11 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-10-23 11:11 UTC (permalink / raw
To: gentoo-commits
commit: d38ff8a371fc3066a06a65983924718d64dc6e35
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 11:07:27 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 11:11:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38ff8a3
dev-python/virtualenv: Backport pypy3.8 fixes
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/virtualenv-20.8.1-pypy38.patch | 102 +++++++++++++++++++++
...v-20.7.2.ebuild => virtualenv-20.7.2-r1.ebuild} | 14 ++-
...v-20.8.1.ebuild => virtualenv-20.8.1-r1.ebuild} | 14 ++-
3 files changed, 124 insertions(+), 6 deletions(-)
diff --git a/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch b/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
new file mode 100644
index 00000000000..4cff243bcf2
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
@@ -0,0 +1,102 @@
+From 8e3e6cceaefaf63acdf1762baac38c88af9fd15b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 2 Oct 2021 15:42:17 +0200
+Subject: [PATCH 1/7] Skip directories when symlinking libraries for PyPy3
+
+The PyPy3 logic creates symlinks for all files from the library
+directory existing alongside the PyPy executable. This is meant
+to ensure that the bundled libraries to which PyPy is linked can also
+be found from inside the virtualenv. However, this logic also symlinks
+all directories which is unnecessary and causes library directory
+collisions with the new install layout. Change to logic to symlink
+non-directories only.
+
+A similar fix has been applied to the internal venv module in PyPy3.8:
+https://foss.heptapod.net/pypy/pypy/-/commit/713b2af9abd2b9453e12c60143e17431a1aefb33
+
+Fixes #2182
+---
+ docs/changelog/2182.bugfix.txt | 2 ++
+ src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 ++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 docs/changelog/2182.bugfix.txt
+
+diff --git a/docs/changelog/2182.bugfix.txt b/docs/changelog/2182.bugfix.txt
+new file mode 100644
+index 000000000..0f26a202b
+--- /dev/null
++++ b/docs/changelog/2182.bugfix.txt
+@@ -0,0 +1,2 @@
++Fixed path collision that could lead to a PermissionError or writing to system
++directories when using PyPy3.8 - by :user:`mgorny`.
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index be5319a2b..f740de963 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -44,6 +44,8 @@ def sources(cls, interpreter):
+ host_lib = Path(interpreter.system_prefix) / "lib"
+ if host_lib.exists() and host_lib.is_dir():
+ for path in host_lib.iterdir():
++ if path.is_dir():
++ continue
+ yield PathRefToDest(path, dest=cls.to_lib)
+
+
+
+From d7ec9269f38dee462c8b3012128aacbbe18894f5 Mon Sep 17 00:00:00 2001
+From: mattip <matti.picus@gmail.com>
+Date: Mon, 4 Oct 2021 12:01:41 +0300
+Subject: [PATCH 2/7] fix stdlib path
+
+---
+ src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index f740de963..0cb83ed9d 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -28,7 +28,7 @@ class PyPy3Posix(PyPy3, PosixSupports):
+ @property
+ def stdlib(self):
+ """PyPy3 respects sysconfig only for the host python, virtual envs is instead lib/pythonx.y/site-packages"""
+- return self.dest / "lib" / "python{}".format(self.interpreter.version_release_str) / "site-packages"
++ return self.dest / "lib" / "pypy{}".format(self.interpreter.version_release_str) / "site-packages"
+
+ @classmethod
+ def _shared_libs(cls):
+
+From e1f065f703fe4b506cbc575a5a7c9d5fb6079095 Mon Sep 17 00:00:00 2001
+From: mattip <matti.picus@gmail.com>
+Date: Mon, 4 Oct 2021 16:06:04 +0300
+Subject: [PATCH 3/7] skip linking/copying the stdlib specifically, extensively
+ comment
+
+---
+ .../create/via_global_ref/builtin/pypy/pypy3.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index 0cb83ed9d..0c26b79f0 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -41,10 +41,18 @@ def to_lib(self, src):
+ def sources(cls, interpreter):
+ for src in super(PyPy3Posix, cls).sources(interpreter):
+ yield src
++ # Also copy/symlink anything under prefix/lib, which, for "portable"
++ # PyPy builds, includes the tk,tcl runtime and a number of shared
++ # objects. In distro-specific builds or on conda this should be empty
++ # (on PyPy3.8+ it will, like on CPython, hold the stdlib).
+ host_lib = Path(interpreter.system_prefix) / "lib"
++ stdlib = Path(interpreter.system_stdlib)
+ if host_lib.exists() and host_lib.is_dir():
+ for path in host_lib.iterdir():
+- if path.is_dir():
++ if stdlib == path:
++ # For PyPy3.8+ the stdlib lives in lib/pypy3.8
++ # We need to avoid creating a symlink to it since that
++ # will defeat the purpose of a virtualenv
+ continue
+ yield PathRefToDest(path, dest=cls.to_lib)
+
diff --git a/dev-python/virtualenv/virtualenv-20.7.2.ebuild b/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
similarity index 89%
rename from dev-python/virtualenv/virtualenv-20.7.2.ebuild
rename to dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
index ab65ca42a21..dc4bf33b431 100644
--- a/dev-python/virtualenv/virtualenv-20.7.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
@@ -52,21 +52,29 @@ BDEPEND="
# dev-python/towncrier
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/virtualenv-20.8.1-pypy38.patch
+)
+
src_configure() {
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
}
python_test() {
- local deselect=(
+ local EPYTEST_DESELECT=(
tests/unit/activation/test_xonsh.py
tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
tests/unit/create/test_creator.py::test_cross_major
)
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
@@ -87,7 +95,7 @@ python_test() {
)
distutils_install_for_testing
- epytest ${deselect[@]/#/--deselect }
+ epytest
}
pkg_postinst() {
diff --git a/dev-python/virtualenv/virtualenv-20.8.1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
similarity index 89%
rename from dev-python/virtualenv/virtualenv-20.8.1.ebuild
rename to dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
index 2bfbb6c72e5..e894d59a1e9 100644
--- a/dev-python/virtualenv/virtualenv-20.8.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
@@ -52,21 +52,29 @@ BDEPEND="
# dev-python/towncrier
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-pypy38.patch
+)
+
src_configure() {
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
}
python_test() {
- local deselect=(
+ local EPYTEST_DESELECT=(
tests/unit/activation/test_xonsh.py
tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
tests/unit/create/test_creator.py::test_cross_major
)
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
@@ -87,7 +95,7 @@ python_test() {
)
distutils_install_for_testing
- epytest ${deselect[@]/#/--deselect }
+ epytest
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/
@ 2021-12-10 17:39 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-12-10 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 8b2558bdad9c77743f26bab164521bc824ea1a25
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 17:35:03 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 17:35:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2558bd
dev-python/virtualenv: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/virtualenv/Manifest | 3 -
.../files/virtualenv-20.8.1-pypy38.patch | 102 ---------------------
dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild | 102 ---------------------
dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild | 102 ---------------------
dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild | 98 --------------------
5 files changed, 407 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b3ee0bc439ca..952885585766 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
DIST virtualenv-20.10.0.tar.gz 9007218 BLAKE2B 1fd37b38679b7375c1eb6e9644418b1653cb6a8dab194c8553fa113cf4a801a7c1d5e6490067767cfb198a0ef2b5ab9cf166783b9c6fac0b2c8b538949c11804 SHA512 df940aa29801a39d39be46d3518a99e93efb2113650abf81d00b4545183ec6806823ce8b754c5a3c951cb64e941944421046c709ed3de6a925489e5ac1988d48
-DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
-DIST virtualenv-20.8.1.tar.gz 8708080 BLAKE2B 703e3e8e07105e4a7154d0e91a13ec2c6b7e37be92e73733a6850c7c1a96711c19b4974bc4f6d3816ea78095b2af807183f53cbc579acad9a7ec6815ea547294 SHA512 db373bdb68efce0ce26cefe508e452b62d4336ccf74f08a51aa61272127c8cd43639443342f42cacb62d7bfd1381bc1204211218c486dfcdb165d8486a2e728b
-DIST virtualenv-20.9.0.tar.gz 9005930 BLAKE2B fb3875c34d282f030d06ad3e6f57d4d8ba9be9f9f40602b0129c5ae68e869a4b64cb5fb7935242518e09fd47294a8d87d6eec6db8f8e78947126564428aff07a SHA512 bfcf60946e2fcc0c4ac2dc9ad48187097961280dbd2353a23cb0aaab97aa63a247637d8f41ed6e6de9d30262978495ebb9519f932ebbb636cf81bb699beeab4d
diff --git a/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch b/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
deleted file mode 100644
index 4cff243bcf2c..000000000000
--- a/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 8e3e6cceaefaf63acdf1762baac38c88af9fd15b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 2 Oct 2021 15:42:17 +0200
-Subject: [PATCH 1/7] Skip directories when symlinking libraries for PyPy3
-
-The PyPy3 logic creates symlinks for all files from the library
-directory existing alongside the PyPy executable. This is meant
-to ensure that the bundled libraries to which PyPy is linked can also
-be found from inside the virtualenv. However, this logic also symlinks
-all directories which is unnecessary and causes library directory
-collisions with the new install layout. Change to logic to symlink
-non-directories only.
-
-A similar fix has been applied to the internal venv module in PyPy3.8:
-https://foss.heptapod.net/pypy/pypy/-/commit/713b2af9abd2b9453e12c60143e17431a1aefb33
-
-Fixes #2182
----
- docs/changelog/2182.bugfix.txt | 2 ++
- src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 ++
- 2 files changed, 4 insertions(+)
- create mode 100644 docs/changelog/2182.bugfix.txt
-
-diff --git a/docs/changelog/2182.bugfix.txt b/docs/changelog/2182.bugfix.txt
-new file mode 100644
-index 000000000..0f26a202b
---- /dev/null
-+++ b/docs/changelog/2182.bugfix.txt
-@@ -0,0 +1,2 @@
-+Fixed path collision that could lead to a PermissionError or writing to system
-+directories when using PyPy3.8 - by :user:`mgorny`.
-diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-index be5319a2b..f740de963 100644
---- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-+++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-@@ -44,6 +44,8 @@ def sources(cls, interpreter):
- host_lib = Path(interpreter.system_prefix) / "lib"
- if host_lib.exists() and host_lib.is_dir():
- for path in host_lib.iterdir():
-+ if path.is_dir():
-+ continue
- yield PathRefToDest(path, dest=cls.to_lib)
-
-
-
-From d7ec9269f38dee462c8b3012128aacbbe18894f5 Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Mon, 4 Oct 2021 12:01:41 +0300
-Subject: [PATCH 2/7] fix stdlib path
-
----
- src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-index f740de963..0cb83ed9d 100644
---- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-+++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-@@ -28,7 +28,7 @@ class PyPy3Posix(PyPy3, PosixSupports):
- @property
- def stdlib(self):
- """PyPy3 respects sysconfig only for the host python, virtual envs is instead lib/pythonx.y/site-packages"""
-- return self.dest / "lib" / "python{}".format(self.interpreter.version_release_str) / "site-packages"
-+ return self.dest / "lib" / "pypy{}".format(self.interpreter.version_release_str) / "site-packages"
-
- @classmethod
- def _shared_libs(cls):
-
-From e1f065f703fe4b506cbc575a5a7c9d5fb6079095 Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Mon, 4 Oct 2021 16:06:04 +0300
-Subject: [PATCH 3/7] skip linking/copying the stdlib specifically, extensively
- comment
-
----
- .../create/via_global_ref/builtin/pypy/pypy3.py | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-index 0cb83ed9d..0c26b79f0 100644
---- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-+++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
-@@ -41,10 +41,18 @@ def to_lib(self, src):
- def sources(cls, interpreter):
- for src in super(PyPy3Posix, cls).sources(interpreter):
- yield src
-+ # Also copy/symlink anything under prefix/lib, which, for "portable"
-+ # PyPy builds, includes the tk,tcl runtime and a number of shared
-+ # objects. In distro-specific builds or on conda this should be empty
-+ # (on PyPy3.8+ it will, like on CPython, hold the stdlib).
- host_lib = Path(interpreter.system_prefix) / "lib"
-+ stdlib = Path(interpreter.system_stdlib)
- if host_lib.exists() and host_lib.is_dir():
- for path in host_lib.iterdir():
-- if path.is_dir():
-+ if stdlib == path:
-+ # For PyPy3.8+ the stdlib lives in lib/pypy3.8
-+ # We need to avoid creating a symlink to it since that
-+ # will defeat the purpose of a virtualenv
- continue
- yield PathRefToDest(path, dest=cls.to_lib)
-
diff --git a/dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild b/dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild
deleted file mode 100644
index f7fb80582664..000000000000
--- a/dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/virtualenv-20.8.1-pypy38.patch
-)
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- distutils_install_for_testing
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild
deleted file mode 100644
index 1d432800bbff..000000000000
--- a/dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-pypy38.patch
-)
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- distutils_install_for_testing
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild b/dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild
deleted file mode 100644
index dc6456e35f41..000000000000
--- a/dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- distutils_install_for_testing
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-12-10 17:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-19 17:18 [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/, dev-python/virtualenv/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-12-10 17:39 Michał Górny
2021-10-23 11:11 Michał Górny
2020-05-28 8:00 Michał Górny
2017-05-03 7:37 Michał Górny
2016-01-17 15:23 Justin Lecher
2015-11-23 10:05 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox