From 727334f71deb0bbdc4afc3a949af02cdbebf01f038710bccd511eedaa9512efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 Sep 2024 17:18:30 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-virtualenv revision ddd009def331cdf82b2db856fa5dbfe2 --- python-virtualenv.changes | 103 +++++++++++++++++++++++++++++++++++--- python-virtualenv.spec | 92 +++++++++++++++------------------- virtualenv-20.23.0.tar.gz | 3 -- virtualenv-20.26.3.tar.gz | 3 ++ 4 files changed, 141 insertions(+), 60 deletions(-) delete mode 100644 virtualenv-20.23.0.tar.gz create mode 100644 virtualenv-20.26.3.tar.gz diff --git a/python-virtualenv.changes b/python-virtualenv.changes index c7f5d81..efb112b 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,7 +1,98 @@ +------------------------------------------------------------------- +Sat Jun 29 12:43:58 UTC 2024 - Dirk Müller + +- update to 20.26.3: + * Bump embeded wheels + +------------------------------------------------------------------- +Mon Jun 10 08:58:41 UTC 2024 - Dirk Müller + +- update to 20.26.2: + * virtualenv.pyz no longer fails when zipapp path contains a + symlink + * Fix bad return code from activate.sh if hashing is disabled + +------------------------------------------------------------------- +Sun May 12 12:26:09 UTC 2024 - Atri Bhattacharya + +- Update to version 20.26.1: + * No Linux related change. +- Changes from version 20.26.0: + * allow builtin discovery to discover specific interpreters + (e.g. python3.12) given an unspecific spec (e.g. python3) - + (gh#pypa/virtualenv#2709) + +------------------------------------------------------------------- +Sat Apr 20 07:42:33 UTC 2024 - Dirk Müller + +- update update 20.25.3: + * Python 3.13.0a6 renamed pathmod to parser + * Upgrade embedded wheels + +------------------------------------------------------------------- +Tue Feb 27 18:13:43 UTC 2024 - Ben Greiner + +- Update to 20.25.1 + * Upgrade embedded wheels: + * Avoid importing contextlib in _virtualenv #2688 + +------------------------------------------------------------------- +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 + +- Add fix-tests-hookimpls.patch to fix tests with latest pytest in + Factory. + +------------------------------------------------------------------- +Tue Oct 3 06:39:58 UTC 2023 - Daniel Garcia + +- Update to v20.24.5: + - Fix brew cannot copy by @gaborbernat in #2640 + - Test with 3.12 rc by @gaborbernat in #2641 + - Upgrade setuptools by @gaborbernat in #2642 + - GitHub Actions: Add PyPy 3.10 to testing by @cclauss in #2638 +- 20.24.4: + - Fix typo found by codespell by @DimitriPapadopoulos in #2624 + - Updating extend.rst typo by @sagardesai1 in #2626 +- 20.24.3: + - Update compatibility docs by @jugmac00 in #2618 + - fix ResourceWarning on process exit (#2472) by @sigma67 in #2617 + - added scripts in tasks directory to sdist on build (#2610) by @sigma67 in #2620 + - Bump wheel by @gaborbernat in #2622 +- 20.24.2: + - Bump pip and wheel by @gaborbernat in #2614 +- 20.24.1: + - Upgrade pip by @arielkirkwood in #2611 +- 20.24.0: + - Fix the CI by @gaborbernat in #2593 + - Quickstart guide by @AlvesJorge in #2599 + - Updated CLI documentation with config file name by @nathanczh in #2602 + - Exclude dependabot and pre-commit ci from release notes by @gaborbernat in #2603 + - Export VIRTUAL_ENV_PROMPT in activation scripts (#2194) by @jimporter in #2606 + - Upgrade setuptools by @gaborbernat in #2607 + +------------------------------------------------------------------- +Fri Jun 30 15:40:31 UTC 2023 - Markéta Machová + +- Update to v20.23.1 + * update and simplify nushell activation script + ------------------------------------------------------------------- Mon May 22 08:32:57 UTC 2023 - Steve Kowalik -- Add missing BuildRequires on time-machine +- Add missing BuildRequires on time-machine ------------------------------------------------------------------- Fri May 12 09:12:55 UTC 2023 - Daniel Garcia @@ -91,7 +182,7 @@ Fri Mar 17 14:01:37 UTC 2023 - pgajdos@suse.com Wed Jan 11 03:46:18 UTC 2023 - Steve Kowalik - Add python_module devel to BuildRequires in the test flavor, since - the test suite checks if the include path exists. + the test suite checks if the include path exists. ------------------------------------------------------------------- Sat Dec 3 02:36:31 UTC 2022 - Yogalakshmi Arunachalam @@ -289,7 +380,7 @@ Wed Sep 29 16:35:34 UTC 2021 - Ben Greiner ------------------------------------------------------------------- Tue Sep 14 08:21:26 UTC 2021 - Steve Kowalik -- Add missing Requires on two modules. +- Add missing Requires on two modules. - Drop no longer required appdirs Requires. - Shift new BuildRequires to :test to avoid cycles. @@ -346,9 +437,9 @@ Sun Dec 6 23:22:34 UTC 2020 - Benjamin Greiner gh#openSUSE/python-rpm-macros#66 - Update to 20.2.1 * Optionally skip VCS ignore directive for entire virtualenv directory - * Add ``--read-only-app-data`` option to allow for creation based on + * Add ``--read-only-app-data`` option to allow for creation based on an existing app data cache which is non-writable - * The python specification can now take one or more values, first found + * The python specification can now take one or more values, first found is used to create the virtual environment ------------------------------------------------------------------- @@ -794,7 +885,7 @@ Mon Jul 29 14:29:55 UTC 2013 - speilicke@suse.com + Along with this, --never-download is now always pinned to True, and is only being maintained in the short term for backward compatibility (Pull #412). + IMPORTANT Switched to the new setuptools (v0.9.7) which has been merged with - Distribute again and works for Python 2 and 3 with one codebase. The + Distribute again and works for Python 2 and 3 with one codebase. The --distribute and --setuptools options are now no-op. + Updated to pip 1.4. + Added support for PyPy3k diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 0e5eaa4..388021d 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-virtualenv # -# 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,51 +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.23.0 +Version: 20.26.3 Release: 0 Summary: Virtual Python Environment builder License: MIT -URL: http://www.virtualenv.org/ +URL: https://virtualenv.pypa.io/ +# SourceRepository: https://github.com/pypa/virtualenv Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz -BuildRequires: %{python_module distlib >= 0.3.6} -BuildRequires: %{python_module filelock >= 3.11} -BuildRequires: %{python_module hatch-vcs >= 0.3} -BuildRequires: %{python_module hatchling >= 1.14} -BuildRequires: %{python_module importlib-metadata >= 6.4.1 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 >= 3.2} -BuildRequires: %{python_module setuptools >= 41.0.0} -BuildRequires: %{python_module wheel} -BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-distlib >= 0.3.6 -Requires: python-filelock >= 3.11 -Requires: python-platformdirs >= 3.2 +%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 +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} -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 @@ -96,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.23.0.tar.gz b/virtualenv-20.23.0.tar.gz deleted file mode 100644 index d655a48..0000000 --- a/virtualenv-20.23.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a85caa554ced0c0afbd0d638e7e2d7b5f92d23478d05d17a76daeac8f279f924 -size 6617594 diff --git a/virtualenv-20.26.3.tar.gz b/virtualenv-20.26.3.tar.gz new file mode 100644 index 0000000..1bf5f58 --- /dev/null +++ b/virtualenv-20.26.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a +size 9057588