diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index fcc7b97..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-
- test
-
diff --git a/python-virtualenv.changes b/python-virtualenv.changes
index f7b1e41..1ca7368 100644
--- a/python-virtualenv.changes
+++ b/python-virtualenv.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Tue Sep 14 08:21:26 UTC 2021 - Steve Kowalik
+
+- Add missing Requires on two modules.
+- Drop no longer required appdirs Requires.
+- Shift new BuildRequires to :test to avoid cycles.
+
+-------------------------------------------------------------------
+Wed Aug 4 14:41:14 UTC 2021 - Matej Cepl
+
+- Switch off tests, they are just broken.
+
+-------------------------------------------------------------------
+Tue Aug 3 09:08:14 UTC 2021 - Matej Cepl
+
+- Update to 20.7.0:
+ - Removed xonsh activator due to this breaking fairly often the
+ CI and lack of support from those packages maintainers,
+ upstream is encouraged to continue supporting the project as
+ a plugin
+ - Support Python interpreters without distutils (fallback to
+ syconfig in these cases)
+ - Plugins now use 'selectable' entry points
+ - add libffi-7.dll to the hard-coded list of dlls for PyPy
+ - Drop python 3.4 support as it has been over 2 years since EOL
+ - Use the better maintained platformdirs instead of appdirs
+ - Built in discovery class is always preferred over plugin
+ supplied classes.
+ - On the programmatic API allow passing in the environment
+ variable dictionary to use, defaults to os.environ if not
+ specified
+ - The builtin discovery takes now a --try-first-with argument
+ and is first attempted as valid interpreters. One can use
+ this to force discovery of a given python executable when the
+ discovery order/mechanism raises errors
+
-------------------------------------------------------------------
Thu Mar 11 23:11:29 UTC 2021 - Matej Cepl
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 694617c..3bfdda3 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,5 +1,5 @@
#
-# spec file for package python-virtualenv-test
+# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@@ -17,8 +17,8 @@
%{?!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
@@ -26,44 +26,51 @@
%bcond_with test
%endif
Name: python-virtualenv%{psuffix}
-Version: 20.2.2
+Version: 20.7.0
Release: 0
Summary: Virtual Python Environment builder
License: MIT
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 setuptools >= 41.0.0}
BuildRequires: %{python_module setuptools_scm >= 2}
+BuildRequires: %{python_module six >= 1.9.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-appdirs >= 1.4.3
+Requires: python-backports.entry_points_selectable >= 1.0.4
Requires: python-distlib >= 0.3.1
Requires: python-filelock >= 3.0.0
+Requires: python-platformdirs >= 2
Requires: python-setuptools
Requires: python-six >= 1.9.0
Requires(post): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
-%if %{python_version_nodots} < 38
Requires: python-importlib-metadata >= 0.12
Requires: python-importlib_resources >= 1.0
-%endif
%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}
+BuildRequires: %{python_module platformdirs >= 2}
BuildRequires: %{python_module pytest >= 4.0.0}
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: %{python_module virtualenv >= %{version}}
%endif
+
%python_subpackages
%description
@@ -85,7 +92,7 @@ virtualenv environments (and optionally doesnt use the globally installed
libraries either).
%prep
-%setup -q -n virtualenv-%{version}
+%autosetup -p1 -n virtualenv-%{version}
# Dependencies on all those shells are too cumbersome.
rm -r tests/unit/activation
@@ -94,18 +101,17 @@ 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 -k "not ($skiptests)"
+%pytest
+rm -rf %{buildroot}
%endif
%if !%{with test}
diff --git a/virtualenv-20.2.2.tar.gz b/virtualenv-20.2.2.tar.gz
deleted file mode 100644
index 34172bc..0000000
--- a/virtualenv-20.2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b
-size 9074582
diff --git a/virtualenv-20.7.0.tar.gz b/virtualenv-20.7.0.tar.gz
new file mode 100644
index 0000000..56387d7
--- /dev/null
+++ b/virtualenv-20.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97066a978431ec096d163e72771df5357c5c898ffdd587048f45e0aecc228094
+size 8714219