From 988ae900dbfd1c4ab3fa79688db2b503a26ce035122acc09221f29cb0c99de7f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 3 Aug 2021 09:07:08 +0000 Subject: [PATCH 1/6] Update tarball. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=101 --- python-virtualenv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 694617c..2491586 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 # From 83bf479dd376959d49a84cde720796da4e7c4d12f456d73b6b606c60bf212207 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 26 Aug 2021 06:50:47 +0000 Subject: [PATCH 2/6] Accepting request 910165 from home:mcepl:branches:devel:languages:python - Switch off tests, they are just broken. - 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 OBS-URL: https://build.opensuse.org/request/show/910165 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=102 --- _multibuild | 3 --- python-virtualenv.changes | 29 +++++++++++++++++++++++++++++ python-virtualenv.spec | 25 +++++++++++++++---------- virtualenv-20.2.2.tar.gz | 3 --- virtualenv-20.7.0.tar.gz | 3 +++ 5 files changed, 47 insertions(+), 16 deletions(-) delete mode 100644 _multibuild delete mode 100644 virtualenv-20.2.2.tar.gz create mode 100644 virtualenv-20.7.0.tar.gz 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..41b6a5d 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +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 2491586..437408d 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -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,14 +26,21 @@ %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 backports.entry_points_selectable >= 1.0.4} +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 platformdirs >= 2} 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 @@ -44,10 +51,8 @@ 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 @@ -57,13 +62,14 @@ 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 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 +91,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 +100,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 From 552693e7b148034b960c9b66f16576329bc45214f55c08da05ea42ad8ed5383c Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 14 Sep 2021 07:38:40 +0000 Subject: [PATCH 3/6] - Add missing Requires on platformdirs. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=103 --- python-virtualenv.changes | 5 +++++ python-virtualenv.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-virtualenv.changes b/python-virtualenv.changes index 41b6a5d..d05120d 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 14 07:38:15 UTC 2021 - Steve Kowalik + +- Add missing Requires on platformdirs. + ------------------------------------------------------------------- Wed Aug 4 14:41:14 UTC 2021 - Matej Cepl diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 437408d..3cdb65d 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -46,6 +46,7 @@ BuildRequires: python-rpm-macros Requires: python-appdirs >= 1.4.3 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 From c4fed9ecb517e979cb5ef1f584a93ef4f3f60da4b07f753c14534bd842bbe290 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 14 Sep 2021 08:10:32 +0000 Subject: [PATCH 4/6] - Add missing Requires on two modules. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=104 --- python-virtualenv.changes | 4 ++-- python-virtualenv.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python-virtualenv.changes b/python-virtualenv.changes index d05120d..e75c077 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Sep 14 07:38:15 UTC 2021 - Steve Kowalik +Tue Sep 14 08:09:51 UTC 2021 - Steve Kowalik -- Add missing Requires on platformdirs. +- Add missing Requires on two modules. ------------------------------------------------------------------- Wed Aug 4 14:41:14 UTC 2021 - Matej Cepl diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 3cdb65d..cc42743 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -44,6 +44,7 @@ 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 From d613e24eda24a57579090b1b432cfe53e5b467dae43aa090324dea0e609ee946 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 14 Sep 2021 08:16:41 +0000 Subject: [PATCH 5/6] - Drop no longer required appdirs Requires. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=105 --- python-virtualenv.changes | 1 + python-virtualenv.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/python-virtualenv.changes b/python-virtualenv.changes index e75c077..c4d1444 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -2,6 +2,7 @@ Tue Sep 14 08:09:51 UTC 2021 - Steve Kowalik - Add missing Requires on two modules. +- Drop no longer required appdirs Requires. ------------------------------------------------------------------- Wed Aug 4 14:41:14 UTC 2021 - Matej Cepl diff --git a/python-virtualenv.spec b/python-virtualenv.spec index cc42743..15350d2 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -43,7 +43,6 @@ 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 From d22bcb7db570bff5c11e5f50d9ffca574870b1c75bda0ca72bc42cf97645dc10 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 14 Sep 2021 08:21:59 +0000 Subject: [PATCH 6/6] - Shift new BuildRequires to :test to avoid cycles. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=106 --- python-virtualenv.changes | 3 ++- python-virtualenv.spec | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python-virtualenv.changes b/python-virtualenv.changes index c4d1444..1ca7368 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Tue Sep 14 08:09:51 UTC 2021 - Steve Kowalik +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 diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 15350d2..3bfdda3 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -32,12 +32,10 @@ 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 backports.entry_points_selectable >= 1.0.4} 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 platformdirs >= 2} BuildRequires: %{python_module setuptools >= 41.0.0} BuildRequires: %{python_module setuptools_scm >= 2} BuildRequires: %{python_module six >= 1.9.0} @@ -59,11 +57,13 @@ 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}