| |
@@ -9,6 +9,13 @@
|
| |
# pipenv/vendor/vendor_pip.txt inside the sources, and possibly diff them
|
| |
# with the previous version)
|
| |
|
| |
+ # pipenv devendoring checklist
|
| |
+ # - Add the package to the UNBUNDLED variable here in the spec file
|
| |
+ # - Remove the %%license file from the %%files section
|
| |
+ # - Remove the license file from the `bundled-licenses` file
|
| |
+ # - Remove the bundled() Provides
|
| |
+ # - Add Requires and BuildRequires on the relevant Fedora package
|
| |
+
|
| |
%global base_version 2020.11.15
|
| |
# %%global prerelease_version --
|
| |
|
| |
@@ -22,7 +29,7 @@
|
| |
|
| |
Name: pipenv
|
| |
Version: %{base_version}%{?prerelease_version:~%{prerelease_version}}
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
Summary: The higher level Python packaging tool
|
| |
|
| |
# Pipenv source code is MIT, there are bundled packages having different licenses
|
| |
@@ -107,7 +114,6 @@
|
| |
BuildRequires: python3dist(toml) >= 0.10.2
|
| |
BuildRequires: python3dist(urllib3)
|
| |
BuildRequires: python3dist(yarg) >= 0.1.9
|
| |
- BuildRequires: python3dist(pipdeptree)
|
| |
BuildRequires: python3dist(pipreqs)
|
| |
# Bundled version of plette is 0.2.3, but Fedora has an older version
|
| |
BuildRequires: python3dist(plette) >= 0.2.2
|
| |
@@ -145,7 +151,6 @@
|
| |
Requires: python3dist(toml) >= 0.10.2
|
| |
Requires: python3dist(urllib3)
|
| |
Requires: python3dist(yarg) >= 0.1.9
|
| |
- Requires: python3dist(pipdeptree)
|
| |
Requires: python3dist(pipreqs)
|
| |
Requires: python3dist(plette) >= 0.2.3
|
| |
|
| |
@@ -158,6 +163,7 @@
|
| |
Provides: bundled(python3dist(delegator-py)) = 0.1.1
|
| |
# Needs requirementslib (see below)
|
| |
Provides: bundled(python3dist(passa))
|
| |
+ Provides: bundled(python3dist(pipdeptree)) = 1.0.0
|
| |
# 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.
|
| |
@@ -253,7 +259,7 @@
|
| |
rm -rf pipenv/patched/yaml2/
|
| |
|
| |
# Remove packages that are already packaged for Fedora from vendor directory
|
| |
- UNBUNDLED="appdirs attr cached_property cerberus click colorama distlib docopt first chardet iso8601 jinja2 markupsafe packaging parse pexpect ptyprocess pyparsing dotenv requests certifi idna urllib3 semver shellingham six toml yarg plette pipreqs pipdeptree"
|
| |
+ UNBUNDLED="appdirs attr cached_property cerberus click colorama distlib docopt first chardet iso8601 jinja2 markupsafe packaging parse pexpect ptyprocess pyparsing dotenv requests certifi idna urllib3 semver shellingham six toml yarg plette pipreqs"
|
| |
|
| |
# issue: for loop below doesn't handle multiple imports in one line
|
| |
# properly. There might be case when library is still not unbundled
|
| |
@@ -415,6 +421,7 @@
|
| |
%license %{python3_sitelib}/%{name}/vendor/pathlib2/LICENSE.rst
|
| |
%license %{python3_sitelib}/%{name}/vendor/pep517/LICENSE
|
| |
%license %{python3_sitelib}/%{name}/vendor/pip_shims/LICENSE
|
| |
+ %license %{python3_sitelib}/%{name}/vendor/pipdeptree.LICENSE
|
| |
%license %{python3_sitelib}/%{name}/vendor/pythonfinder/LICENSE.txt
|
| |
%license %{python3_sitelib}/%{name}/vendor/pythonfinder/_vendor/pep514tools/LICENSE
|
| |
%license %{python3_sitelib}/%{name}/vendor/pythonfinder/pep514tools.LICENSE
|
| |
@@ -436,6 +443,10 @@
|
| |
%license LICENSE
|
| |
|
| |
%changelog
|
| |
+ * Tue Apr 13 2021 Tomas Orsava <torsava@redhat.com> - 2020.11.15-2
|
| |
+ - First draft of the patch provided by Laurent Almeras <lalmeras@gmail.com>
|
| |
+ - Revendored: pipdeptree
|
| |
+
|
| |
* Wed Feb 03 2021 Petr Viktorin <pviktori@redhat.com> - 2020.11.15-1
|
| |
- Update to 2020.11.15
|
| |
|
| |
torsava
commented 2 years ago
Update of pipdeptree to version 2.0.0 is not backwards compatible with the current pipenv version