From 1f49fbe42e6def41260981fd420f2bbd471fa02b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 26 May 2020 17:18:26 +0200 Subject: [PATCH] dev-python/virtualenv: Port to py39 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../files/virtualenv-20.0.21-py39.patch | 27 +++++++++++++++++++ .../virtualenv/virtualenv-16.7.10.ebuild | 2 +- .../virtualenv/virtualenv-20.0.21.ebuild | 6 ++++- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch 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 000000000000..221cc734d268 --- /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?= +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 17e73c44a3fb..72bbf587452c 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 a2cafd2f7921..598bd3439d0e 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 -- 2.26.2