diff --git a/.gitignore b/.gitignore index 4e8d8c7..8199630 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /pipenv-2022.7.24.tar.gz /pipenv-2022.8.5.tar.gz /pipenv-2022.10.25.tar.gz +/pipenv-2023.2.18.tar.gz diff --git a/bundled-licenses b/bundled-licenses index 10d4e42..7d919ac 100644 --- a/bundled-licenses +++ b/bundled-licenses @@ -29,11 +29,10 @@ # pipenv/patched/pip/_vendor/idna/ is BSD # pipenv/patched/pip/_vendor/msgpack/ is ASL 2.0 # pipenv/patched/pip/_vendor/packaging/ is (ASL 2.0 or BSD) -# pipenv/patched/pip/_vendor/pep517/ is MIT and ASL 2.0 -# pipenv/patched/pip/_vendor/pkg_resources/ is MIT # pipenv/patched/pip/_vendor/platformdirs/ is MIT # pipenv/patched/pip/_vendor/pygments/ is BSD # pipenv/patched/pip/_vendor/pyparsing/ is MIT +# pipenv/patched/pip/_vendor/pyproject_hooks/ is MIT # pipenv/patched/pip/_vendor/requests/ is ASL 2.0 # pipenv/patched/pip/_vendor/resolvelib/ is ISC # pipenv/patched/pip/_vendor/rich/ is MIT @@ -46,32 +45,26 @@ # pipenv/patched/pip/six.py is ASL 2.0 # pipenv/patched/pip/typing_extensions.py is Python # pipenv/patched/safety/ is MIT -# pipenv/vendor/ is MIT -# pipenv/vendor/attr/ is MIT +# pipenv/vendor/attrs/ is MIT # pipenv/vendor/cerberus/ is ISC # pipenv/vendor/click/ is BSD # pipenv/vendor/click_didyoumean/ is MIT # pipenv/vendor/colorama/ is BSD -# pipenv/vendor/distlib/ is Python # pipenv/vendor/dotenv/ is BSD # pipenv/vendor/dparse/ is MIT -# pipenv/vendor/idna/ is BSD # pipenv/vendor/markupsafe/ is BSD -# pipenv/vendor/parse.py is MIT +# pipenv/vendor/pep517/ is MIT and ASL 2.0 # pipenv/vendor/pexpect/ is ISC # pipenv/vendor/pipdeptree/ is MIT -# pipenv/vendor/platformdirs/ is MIT # pipenv/vendor/plette/ is ISC # pipenv/vendor/ptyprocess/ is ISC # pipenv/vendor/pyparsing/ is MIT # pipenv/vendor/pythonfinder/ is MIT # pipenv/vendor/pythonfinder/_vendor/pep514tools/ is MIT # pipenv/vendor/requirementslib/ is MIT +# pipenv/vendor/ruamel.yaml is MIT +# pipenv/vendor/ruamel.yaml-0.17.21-py3.9-nspkg.pth is MIT # pipenv/vendor/shellingham/ is ISC -# pipenv/vendor/termcolor.py is MIT # pipenv/vendor/toml/ is MIT -# pipenv/vendor/tomli/ is MIT # pipenv/vendor/tomlkit/ is MIT # pipenv/vendor/vistir/ is BSD -# pipenv/vendor/wheel/ is MIT -# pipenv/vendor/yaspin/ is MIT diff --git a/pipenv.spec b/pipenv.spec index 159ebd6..c1350b5 100644 --- a/pipenv.spec +++ b/pipenv.spec @@ -12,7 +12,7 @@ # * pipenv/vendor/pythonfinder/_vendor/vendor.txt # inside the sources, and possibly diff them with the previous version) -%global base_version 2022.10.25 +%global base_version 2023.2.18 # %%global prerelease_version -- # Test artifacts are not released, we have to download the commit tree @@ -25,7 +25,7 @@ Name: pipenv Version: %{base_version}%{?prerelease_version:~%{prerelease_version}} -Release: 4%{?dist} +Release: 1%{?dist} Summary: The higher level Python packaging tool # Pipenv source code is MIT, there are bundled packages having different licenses @@ -39,10 +39,6 @@ Source1: https://github.com/sarugaku/pipenv-test-artifacts/archive/%{test # List of licenses of the bundled packages Source2: bundled-licenses -# Adds "pytest_pypi.plugin import pypi, ..." to conftest, -# as we don't have that plugin installed and it is not autodiscovered -Patch2: 0002-import-pytest-pypi.patch - # Use the system level root certificate instead of the one bundled in certifi # https://bugzilla.redhat.com/show_bug.cgi?id=1655253 Patch4: dummy-certifi.patch @@ -51,10 +47,6 @@ Patch4: dummy-certifi.patch # pip and distlib Patch6: remove-bundled-exe-files.patch -# Fix compatibility with Python 3.11 in the vendored attrs library -# See: https://github.com/pypa/pipenv/issues/5449 -Patch7: fix-set_closure_cell-on-3.11.patch - BuildArch: noarch BuildRequires: ca-certificates @@ -109,33 +101,35 @@ Requires: which %global bundled %{expand: Provides: bundled(python3dist(click-didyoumean)) = 0.0.3 Provides: bundled(python3dist(pipdeptree)) = 2.3.1 +Provides: bundled(python3dist(ruamel-yaml)) = 0.17.21 # This library uses pip.internals. Some changes in init methods happened there. # So version 1.3.3 is useless with pip 19+ and newer versions will break pipenv # because pipenv has bundled patched pip. -Provides: bundled(python3dist(requirementslib)) = 2.1 +Provides: bundled(python3dist(requirementslib)) = 2.2.3 # The sources contains patched versions of following packages: -Provides: bundled(python3dist(pip)) = 22.3 -Provides: bundled(python3dist(safety)) = 1.10.3 +Provides: bundled(python3dist(pip)) = 23.0.1 +Provides: bundled(python3dist(safety)) = 2.3.2 # We cannot unbundle this easily, # See https://bugzilla.redhat.com/show_bug.cgi?id=1767003 Provides: bundled(python3dist(tomlkit)) = 0.9.2 -# The packages bundled with pip (22.0.4): +# The packages bundled with pip: Provides: bundled(python3dist(cachecontrol)) = 0.12.11 -Provides: bundled(python3dist(chardet)) = 5 -Provides: bundled(python3dist(colorama)) = 0.4.4 +Provides: bundled(python3dist(chardet)) = 5.1 +Provides: bundled(python3dist(colorama)) = 0.4.6 Provides: bundled(python3dist(distlib)) = 0.3.6 -Provides: bundled(python3dist(distro)) = 1.7 -Provides: bundled(python3dist(idna)) = 3.2 +Provides: bundled(python3dist(distro)) = 1.8 +Provides: bundled(python3dist(idna)) = 3.4 Provides: bundled(python3dist(msgpack)) = 1.0.4 Provides: bundled(python3dist(packaging)) = 21.3 -Provides: bundled(python3dist(platformdirs)) = 2.5.2 +Provides: bundled(python3dist(platformdirs)) = 2.6.2 Provides: bundled(python3dist(pygments)) = 2.13 -Provides: bundled(python3dist(requests)) = 2.28.1 +Provides: bundled(python3dist(pyproject-hooks)) = 1 +Provides: bundled(python3dist(requests)) = 2.28.2 Provides: bundled(python3dist(resolvelib)) = 0.8.1 -Provides: bundled(python3dist(rich)) = 12.5.1 +Provides: bundled(python3dist(rich)) = 12.6 Provides: bundled(python3dist(setuptools)) = 44 Provides: bundled(python3dist(six)) = 1.16 Provides: bundled(python3dist(tenacity)) = 8.1 @@ -145,35 +139,25 @@ Provides: bundled(python3dist(webencodings)) = 0.5.1 # The packages bundles with pipenv # Some occur twice - with pip and pipenv, possibly with different versions -Provides: bundled(python3dist(attrs)) = 21.2 +Provides: bundled(python3dist(attrs)) = 22.1 Provides: bundled(python3dist(cerberus)) = 1.3.4 -Provides: bundled(python3dist(certifi)) = 2022.9.24 +Provides: bundled(python3dist(certifi)) = 2022.12.7 Provides: bundled(python3dist(click)) = 8.0.3 -Provides: bundled(python3dist(colorama)) = 0.4.5 -Provides: bundled(python3dist(distlib)) = 0.3.2 Provides: bundled(python3dist(dparse)) = 0.6.2 -Provides: bundled(python3dist(idna)) = 3.4 Provides: bundled(python3dist(markupsafe)) = 2.0.1 Provides: bundled(python3dist(packaging)) = 21.3 -Provides: bundled(python3dist(parse)) = 1.19 Provides: bundled(python3dist(pep514tools)) Provides: bundled(python3dist(pep517)) = 0.13 Provides: bundled(python3dist(pexpect)) = 4.8 -Provides: bundled(python3dist(platformdirs)) = 2.4 -Provides: bundled(python3dist(plette)) = 0.4.2 +Provides: bundled(python3dist(plette)) = 0.4.4 Provides: bundled(python3dist(ptyprocess)) = 0.7 Provides: bundled(python3dist(pyparsing)) = 3.0.9 -Provides: bundled(python3dist(pythonfinder)) = 1.3.1 +Provides: bundled(python3dist(pythonfinder)) = 1.3.2 Provides: bundled(python3dist(python-dotenv)) = 0.19 -Provides: bundled(python3dist(requests)) = 2.28.1 Provides: bundled(python3dist(shellingham)) = 1.5 -Provides: bundled(python3dist(termcolor)) = 1.1 Provides: bundled(python3dist(toml)) = 0.10.2 -Provides: bundled(python3dist(tomli)) = 1.1 -Provides: bundled(python3dist(urllib3)) = 1.26.12 -Provides: bundled(python3dist(vistir)) = 0.6.1 -Provides: bundled(python3dist(wheel)) = 0.37.1 -Provides: bundled(python3dist(yaspin)) = 2 +Provides: bundled(python3dist(urllib3)) = 1.26.14 +Provides: bundled(python3dist(vistir)) = 0.7.5 } %{bundled} @@ -210,7 +194,6 @@ sed -i /setup_requires/d setup.py # Remove windows executable binaries # This goes together with patch6 rm -v pipenv/patched/pip/_vendor/distlib/*.exe -rm -v pipenv/vendor/distlib/*.exe %build %py3_build @@ -284,11 +267,10 @@ rm -rf check_path %license %{python3_sitelib}/%{name}/patched/pip/_vendor/packaging/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/packaging/LICENSE.APACHE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/packaging/LICENSE.BSD -%license %{python3_sitelib}/%{name}/patched/pip/_vendor/pep517/LICENSE -%license %{python3_sitelib}/%{name}/patched/pip/_vendor/pkg_resources/LICENSE -%license %{python3_sitelib}/%{name}/patched/pip/_vendor/platformdirs/LICENSE.txt +%license %{python3_sitelib}/%{name}/patched/pip/_vendor/platformdirs/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/pygments/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/pyparsing/LICENSE +%license %{python3_sitelib}/%{name}/patched/pip/_vendor/pyproject_hooks/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/requests/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/resolvelib/LICENSE %license %{python3_sitelib}/%{name}/patched/pip/_vendor/rich/LICENSE @@ -301,21 +283,17 @@ rm -rf check_path %license %{python3_sitelib}/%{name}/patched/pip/six.LICENSE %license %{python3_sitelib}/%{name}/patched/pip/typing_extensions.LICENSE %license %{python3_sitelib}/%{name}/patched/safety/LICENSE -%license %{python3_sitelib}/%{name}/vendor/LICENSE -%license %{python3_sitelib}/%{name}/vendor/attr/LICENSE +%license %{python3_sitelib}/%{name}/vendor/attrs/LICENSE %license %{python3_sitelib}/%{name}/vendor/cerberus/LICENSE %license %{python3_sitelib}/%{name}/vendor/click/LICENSE.rst %license %{python3_sitelib}/%{name}/vendor/click_didyoumean/LICENSE %license %{python3_sitelib}/%{name}/vendor/colorama/LICENSE.txt -%license %{python3_sitelib}/%{name}/vendor/distlib/LICENSE.txt %license %{python3_sitelib}/%{name}/vendor/dotenv/LICENSE %license %{python3_sitelib}/%{name}/vendor/dparse/LICENSE -%license %{python3_sitelib}/%{name}/vendor/idna/LICENSE.md %license %{python3_sitelib}/%{name}/vendor/markupsafe/LICENSE.rst -%license %{python3_sitelib}/%{name}/vendor/parse.LICENSE +%license %{python3_sitelib}/%{name}/vendor/pep517/LICENSE %license %{python3_sitelib}/%{name}/vendor/pexpect/LICENSE %license %{python3_sitelib}/%{name}/vendor/pipdeptree/LICENSE -%license %{python3_sitelib}/%{name}/vendor/platformdirs/LICENSE.txt %license %{python3_sitelib}/%{name}/vendor/plette/LICENSE %license %{python3_sitelib}/%{name}/vendor/ptyprocess/LICENSE %license %{python3_sitelib}/%{name}/vendor/pyparsing/LICENSE @@ -323,14 +301,12 @@ rm -rf check_path %license %{python3_sitelib}/%{name}/vendor/pythonfinder/LICENSE.txt %license %{python3_sitelib}/%{name}/vendor/pythonfinder/_vendor/pep514tools/LICENSE %license %{python3_sitelib}/%{name}/vendor/requirementslib/LICENSE +%license %{python3_sitelib}/%{name}/vendor/ruamel.yaml-0.17.21-py3.9-nspkg.pth.LICENSE +%license %{python3_sitelib}/%{name}/vendor/ruamel.yaml.LICENSE %license %{python3_sitelib}/%{name}/vendor/shellingham/LICENSE -%license %{python3_sitelib}/%{name}/vendor/termcolor.COPYING.txt %license %{python3_sitelib}/%{name}/vendor/toml/LICENSE -%license %{python3_sitelib}/%{name}/vendor/tomli/LICENSE %license %{python3_sitelib}/%{name}/vendor/tomlkit/LICENSE %license %{python3_sitelib}/%{name}/vendor/vistir/LICENSE -%license %{python3_sitelib}/%{name}/vendor/wheel/LICENSE.txt -%license %{python3_sitelib}/%{name}/vendor/yaspin/LICENSE %doc README.md NOTICES CHANGELOG.rst HISTORY.txt %{_bindir}/pipenv @@ -343,6 +319,10 @@ rm -rf check_path %license LICENSE %changelog +* Wed Mar 15 2023 Tomas Orsava - 2023.2.18-1 +- Rebase to version 2023.2.18 +Resolves: rhbz#2140230 + * Mon Mar 13 2023 Miro Hrončok - 2022.10.25-4 - Do not include [extras] in bundled(python3dist()) Provides - See https://bugzilla.redhat.com/2140230#c12 diff --git a/remove-bundled-exe-files.patch b/remove-bundled-exe-files.patch index e032d8d..ddc060a 100644 --- a/remove-bundled-exe-files.patch +++ b/remove-bundled-exe-files.patch @@ -1,4 +1,4 @@ -From 3ea1f1a3424c165b7bc60b10a51900a442d218cb Mon Sep 17 00:00:00 2001 +From 99b0abcd9e1c5b6425b93d37023c9f6fdddc39da Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Mon, 31 Jan 2022 16:54:59 +0100 Subject: [PATCH] Remove the bundled windows executables from the bundled pip @@ -9,7 +9,7 @@ Subject: [PATCH] Remove the bundled windows executables from the bundled pip 1 file changed, 6 deletions(-) diff --git a/setup.py b/setup.py -index 5b46df1..1c60574 100644 +index 94bb1f4..a018222 100644 --- a/setup.py +++ b/setup.py @@ -61,12 +61,6 @@ setup( @@ -22,9 +22,9 @@ index 5b46df1..1c60574 100644 - "w32.exe", - "w64.exe", - ], + "pipenv.vendor.ruamel": ["yaml"], }, python_requires=">=3.7", - zip_safe=True, -- -2.35.3 +2.38.1 diff --git a/sources b/sources index b6132b3..5bd2007 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pipenv-test-artifacts-f5530013426d6392d67cd1703f379d20a768c1cf.tar.gz) = 87787fe73f8fcaf3e18933fa55fba0fbef5eb9c5d72752fbb20219ae332ab0a0d0a508572f891339284c6c0f3f898feecb11026289eedeac7f2661a3b909ec57 -SHA512 (pipenv-2022.10.25.tar.gz) = 0868c1928ae88086730e8af0866d6253805bc729acd764ea317bc341da0841c257d258513b37401d8a05d208b9268dbaa8c1e0a732acc6cebbcb02ba9041363e +SHA512 (pipenv-2023.2.18.tar.gz) = 8ea6dde4b416f74b58765fb47e5f0caa0adfd9c2f7dc4b25d74e11c28daef0154becac03ed101125a519e076fd791ee02c2dcc49e6dc2674143fb77b453911aa