diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/python-virtualenv.changes b/python-virtualenv.changes
index 1ca7368..c9d8847 100644
--- a/python-virtualenv.changes
+++ b/python-virtualenv.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Sep 29 16:35:34 UTC 2021 - Ben Greiner
+
+- Update to 20.8.1
+ * Fixed a bug where while creating a venv on top of an existing
+ one, without cleaning, when seeded wheel version mismatch
+ occurred, multiple .dist-info directories may be present,
+ confounding entrypoint discovery
+ * upgrade embedded setuptools to 58.1.0 and pip to 21.2.4
+- Release to 20.8.0
+ * Add nushell activation script
+- Release 2.7.1
+ * Fix unpacking dictionary items in PythonInfo.install_path
+ (#2165)
+- Fix and activate the test suite
+- Update importlib* dependencies for older pythons
+- Disable the python2 build because there is no
+ python2-platformdirs on any distribution
+
-------------------------------------------------------------------
Tue Sep 14 08:21:26 UTC 2021 - Steve Kowalik
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 3bfdda3..0feadfe 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -16,17 +16,19 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%global flavor @BUILD_FLAVOR@%%{nil}
-%if "%%{flavor}" == "test"
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
%else
%define psuffix %{nil}
%bcond_with test
%endif
+# there is no platformdirs for python2 on any of the target distributions
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-virtualenv%{psuffix}
-Version: 20.7.0
+Version: 20.8.1
Release: 0
Summary: Virtual Python Environment builder
License: MIT
@@ -34,8 +36,8 @@ URL: http://www.virtualenv.org/
Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
BuildRequires: %{python_module distlib >= 0.3.1}
BuildRequires: %{python_module filelock >= 3.0.0}
-BuildRequires: %{python_module importlib-metadata >= 0.12}
-BuildRequires: %{python_module importlib-resources >= 1.0}
+BuildRequires: %{python_module importlib-metadata >= 0.12 if %python-base < 3.8}
+BuildRequires: %{python_module importlib_resources >= 1.0 if %python-base < 3.7}
BuildRequires: %{python_module setuptools >= 41.0.0}
BuildRequires: %{python_module setuptools_scm >= 2}
BuildRequires: %{python_module six >= 1.9.0}
@@ -47,19 +49,21 @@ Requires: python-filelock >= 3.0.0
Requires: python-platformdirs >= 2
Requires: python-setuptools
Requires: python-six >= 1.9.0
+%if 0%{python_version_nodots} < 38
+Requires: python-importlib-metadata >= 0.12
+%endif
+%if 0%{python_version_nodots} < 37
+Requires: python-importlib_resources >= 1.0
+%endif
Requires(post): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
-Requires: python-importlib-metadata >= 0.12
-Requires: python-importlib_resources >= 1.0
%ifpython2
Requires: python-contextlib2 >= 0.6.0
Requires: python-pathlib2 >= 2.3.3
%endif
%if %{with test}
BuildRequires: %{python_module backports.entry_points_selectable >= 1.0.4}
-BuildRequires: %{python_module coverage >= 4.5.1}
-BuildRequires: %{python_module devel}
BuildRequires: %{python_module flaky >= 3}
BuildRequires: %{python_module packaging >= 20.0}
BuildRequires: %{python_module pip}
@@ -69,6 +73,7 @@ BuildRequires: %{python_module pytest-env >= 0.6.2}
BuildRequires: %{python_module pytest-freezegun >= 0.4.1}
BuildRequires: %{python_module pytest-mock >= 2.0.0}
BuildRequires: %{python_module pytest-timeout >= 1.3.4}
+BuildRequires: ca-certificates
%endif
%python_subpackages
@@ -101,17 +106,20 @@ rm -r tests/unit/activation
%python_build
%install
+%if ! %{with test}
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%python_clone -a %{buildroot}%{_bindir}/virtualenv
+%endif
%check
%if %{with test}
export LANG="en_US.UTF8"
-skiptests="test_seed_link_via_app_data"
-# test_seed_link_via_app_data - online tests downloads from pypi
-%pytest
-rm -rf %{buildroot}
+export PIP_CERT="/etc/ssl/ca-bundle.pem"
+export PYTHONPATH=$PWD/src
+# online tests downloads from pypi
+donttest="test_seed_link_via_app_data"
+%pytest -k "not ($donttest)"
%endif
%if !%{with test}
@@ -124,7 +132,8 @@ rm -rf %{buildroot}
%files %{python_files}
%license LICENSE
%doc README.md docs/changelog.rst
-%{python_sitelib}/virtualenv*
+%{python_sitelib}/virtualenv
+%{python_sitelib}/virtualenv-%{version}*-info
%python_alternative %{_bindir}/virtualenv
%endif
diff --git a/virtualenv-20.7.0.tar.gz b/virtualenv-20.7.0.tar.gz
deleted file mode 100644
index 56387d7..0000000
--- a/virtualenv-20.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97066a978431ec096d163e72771df5357c5c898ffdd587048f45e0aecc228094
-size 8714219
diff --git a/virtualenv-20.8.1.tar.gz b/virtualenv-20.8.1.tar.gz
new file mode 100644
index 0000000..b335fed
--- /dev/null
+++ b/virtualenv-20.8.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8
+size 8708080