diff --git a/fix-tests-hookimpls.patch b/fix-tests-hookimpls.patch deleted file mode 100644 index 0b278d4..0000000 --- a/fix-tests-hookimpls.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: virtualenv-20.24.5/tests/conftest.py -=================================================================== ---- virtualenv-20.24.5.orig/tests/conftest.py -+++ virtualenv-20.24.5/tests/conftest.py -@@ -25,7 +25,7 @@ def pytest_configure(config): - """Ensure randomly is called before we re-order""" - manager = config.pluginmanager - -- order = manager.hook.pytest_collection_modifyitems._hookimpls # noqa: SLF001 -+ order = manager.hook.pytest_collection_modifyitems.get_hookimpls() # noqa: SLF001 - dest = next((i for i, p in enumerate(order) if p.plugin is manager.getplugin("randomly")), None) - if dest is not None: - from_pos = next(i for i, p in enumerate(order) if p.plugin is manager.getplugin(__file__)) diff --git a/python-virtualenv.changes b/python-virtualenv.changes index 5189ce7..b5ea407 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 5 13:24:46 UTC 2024 - Ben Greiner + +- Update to 20.25.0 + * Allow platformdirs v4 by @alex in #2664 + * Upgrade embedded wheels +- Drop fix-tests-hookimpls.patch +- Update requirements +- Update test execution: Remove obsolete hacks, don't build again + on test flavor. Accomodate changed behavior with bundled + setuptools on Python 3.12 +- Conflict with setuptools_scm for tests gh#pypa/virtualenv#2668 + ------------------------------------------------------------------- Tue Oct 3 07:10:17 UTC 2023 - Daniel Garcia diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 2ab9da9..3e3e421 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,55 +24,46 @@ %define psuffix %{nil} %bcond_with test %endif -# there is no platformdirs for python2 on any of the target distributions -%define skip_python2 1 + %{?sle15_python_module_pythons} Name: python-virtualenv%{psuffix} -Version: 20.24.5 +Version: 20.25.0 Release: 0 Summary: Virtual Python Environment builder License: MIT URL: http://www.virtualenv.org/ +# SourceRepository: https://github.com/pypa/virtualenv Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz -# PATCH-FIX-OPENSUSE fix-tests-hookimpls.patch -Patch1: fix-tests-hookimpls.patch -BuildRequires: %{python_module distlib >= 0.3.7} -BuildRequires: %{python_module filelock >= 3.12.2} -BuildRequires: %{python_module hatch-vcs >= 0.3} -BuildRequires: %{python_module hatchling >= 1.14} -BuildRequires: %{python_module importlib-metadata >= 6.6 if %python-base < 3.8} -BuildRequires: %{python_module importlib_resources >= 1.0 if %python-base < 3.7} +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} -BuildRequires: %{python_module platformdirs} -BuildRequires: %{python_module setuptools >= 41.0.0} -BuildRequires: %{python_module wheel} -BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-distlib >= 0.3.7 -Requires: python-filelock >= 3.12.2 -Requires: python-platformdirs +%if !%{with test} +# Don't install the build requirements during testing, see setuptools_scm comment below +BuildRequires: %{python_module hatch-vcs >= 0.3} +BuildRequires: %{python_module hatchling >= 1.17.1} +BuildRequires: fdupes +%else +# Conflict with setuptools_scm giving a warning, https://github.com/pypa/virtualenv/issues/2668 +BuildConflicts: %{python_module setuptools_scm} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module flaky >= 3.7} +BuildRequires: %{python_module packaging >= 23.1} +BuildRequires: %{python_module pytest >= 7.4} +BuildRequires: %{python_module pytest-env >= 0.8.2} +BuildRequires: %{python_module pytest-mock >= 3.11.1} +BuildRequires: %{python_module pytest-timeout >= 2.1} +BuildRequires: %{python_module setuptools >= 68} +BuildRequires: %{python_module time-machine >= 2.10} +BuildRequires: %{python_module virtualenv = %{version}} +%endif +Requires: (python-distlib >= 0.3.7 with python-distlib < 1) +Requires: (python-filelock >= 3.12.2 with python-filelock < 4) +Requires: (python-platformdirs >= 3.9.1 with python-platformdirs < 5) Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch %if 0%{python_version_nodots} < 38 -Requires: python-importlib-metadata >= 6.4.1 -%endif -%if 0%{python_version_nodots} < 37 -Requires: python-importlib_resources >= 1.0 -%endif -%if %{with test} -BuildRequires: %{python_module devel} -BuildRequires: %{python_module flaky >= 3} -BuildRequires: %{python_module packaging >= 20.0} -BuildRequires: %{python_module pytest >= 4.0.0} -BuildRequires: %{python_module pytest-env >= 0.6.2} -# note: is unmaintained, was upstream-replaced by pytest-freezer, which we don't have in the distribution yet -# but they both contain the needed fixture, so this is OK until pytest-freezegun dies for good -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 time-machine} -BuildRequires: ca-certificates +Requires: python-importlib-metadata >= 6.6 %endif %python_subpackages @@ -100,41 +91,36 @@ libraries either). # Dependencies on all those shells are too cumbersome. rm -r tests/unit/activation +%if !%{with test} %build %pyproject_wheel %install %pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} - -%if %{with test} -rm %{buildroot}%{_bindir}/virtualenv -%else %python_clone -a %{buildroot}%{_bindir}/virtualenv %endif -%check %if %{with test} -export LANG="en_US.UTF8" -export PIP_CERT="%{_sysconfdir}/ssl/ca-bundle.pem" -export PYTHONPATH=$PWD/src +%check # online tests downloads from pypi donttest="test_seed_link_via_app_data" -# gh#pypa/virtualenv!2431 -donttest+=" or test_py_pyc_missing" -%pytest -k "not ($donttest)" - -# Uninstall everything to avoid errors of files not being packaged -%python_expand rm -r %{buildroot}%{$python_sitelib} +# fails on python312 because it cannot find setuptools and wheel https://virtualenv.pypa.io/en/latest/changelog.html#features-20-23-0 +python312_extratest=" or test_can_build_c_extensions" +%pytest -k "not ($donttest ${$python_extratest})" +# test the special case with the bundles (for all flavors) +export VIRTUALENV_SETUPTOOLS=bundle +export VIRTUALENV_WHEEL=bundle +%pytest -k "${python312_extratest:4}" %endif -%if !%{with test} %post %python_install_alternative virtualenv %postun %python_uninstall_alternative virtualenv +%if !%{with test} %files %{python_files} %license LICENSE %doc README.md diff --git a/virtualenv-20.24.5.tar.gz b/virtualenv-20.24.5.tar.gz deleted file mode 100644 index 3b76d31..0000000 --- a/virtualenv-20.24.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8361967f6da6fbdf1426483bfe9fca8287c242ac0bc30429905721cefbff752 -size 7119883 diff --git a/virtualenv-20.25.0.tar.gz b/virtualenv-20.25.0.tar.gz new file mode 100644 index 0000000..d1c8f53 --- /dev/null +++ b/virtualenv-20.25.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf51c0d9c7dd63ea8e44086fa1e4fb1093a31e963b86959257378aef020e1f1b +size 7150307