#28 Rebase to 2020.8.13
Merged 3 years ago by torsava. Opened 3 years ago by torsava.
rpms/ torsava/pipenv rebase  into  master

file modified
+1
@@ -9,3 +9,4 @@ 

  /pipenv-test-artifacts-1881ecb45431952d2e18e2be3416a8835e53778a.tar.gz

  /pipenv-2020.5.28.tar.gz

  /pipenv-2020.6.2.tar.gz

+ /pipenv-2020.8.13.tar.gz

file modified
+1 -2
@@ -1,9 +1,8 @@ 

  # Pipenv source code is MIT, there are bundled packages having different licenses

  

- # To help with generating this list, use:

+ # To help with generating this list, use this command and check any WARNINGs:

  #  $ ./license-helper.py --bundled-modules bundled-licenses \

  #                        --sources <directory created by fedpkg prep> \

- #                        --list-license-files

  #

  # To compare the licenses of bundled modules in this version of pipenv, with

  # the previous version, use:

file modified
+7
@@ -24,6 +24,8 @@ 

                          help='Path of an empty directory where to copy licenses for diffing')

      args = parser.parse_args()

  

+     licenses_correct = True

+ 

      SOURCES_DIR = Path(args.sources)

      if args.license_diff_dir:

          LICENSE_DIFF_DIR = Path(args.license_diff_dir)
@@ -52,6 +54,7 @@ 

  

              if len(licenses) == 0:

                  print(f"WARNING: License file for `{module}` not found.")

+                 licenses_correct = False

                  continue

  

              all_declared_license_files.update(licenses)
@@ -85,8 +88,12 @@ 

  

      # Print license files that are not declared

      if undeclared_licenses:

+         licenses_correct = False

          print(f"WARNING:")

          print(f"  {len(undeclared_licenses)} bundled license files that were *NOT* declared in `{args.bundled_modules}` were found:")

          for l in sorted(undeclared_licenses):

              print(f"    {l}")

  

+     if not args.list_license_files and licenses_correct:

+         print(f"SUCCESS:")

+         print(f"  The `{args.bundled_modules}` file declares all the bundled modules with licenses correctly.")

file added
+4
@@ -0,0 +1,4 @@ 

+ # These two bundled provides are declared twice, as they're bundled twice separately in pipenv,

+ # once for pipenv itself and once for the bundled pip. Sometimes their versions differ.

+ addFilter(r'useless-provides bundled\(python3dist\(contextlib2\)\)')

+ addFilter(r'useless-provides bundled\(python3dist\(pep517\)\)')

file modified
+7 -4
@@ -9,7 +9,7 @@ 

  #   pipenv/vendor/vendor_pip.txt inside the sources, and possibly diff them

  #   with the previous version)

  

- %global base_version        2020.6.2

+ %global base_version        2020.8.13

  # %%global prerelease_version  --

  

  # Test artifacts are not released, we have to download the commit tree
@@ -22,7 +22,7 @@ 

  

  Name:           pipenv

  Version:        %{base_version}%{?prerelease_version:~%{prerelease_version}}

- Release:        2%{?dist}

+ Release:        1%{?dist}

  Summary:        The higher level Python packaging tool

  

  # Pipenv source code is MIT, there are bundled packages having different licenses
@@ -167,7 +167,7 @@ 

  # 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)) == 1.5.11

+ Provides:       bundled(python3dist(requirementslib)) == 1.5.13

  # Dependency of passa

  Provides:       bundled(python3dist(resolvelib)) == 0.3.0

  
@@ -213,7 +213,7 @@ 

  Provides:       bundled(python3dist(webencodings)) = 0.5.1

  

  # Re-bundled because it's only used by pipenv

- Provides:       bundled(python3dist(pip-shims)) = 0.5.2

+ Provides:       bundled(python3dist(pip-shims)) = 0.5.3

  Provides:       bundled(python3dist(pythonfinder)) = 1.2.4

  Provides:       bundled(python3dist(yaspin)) = 0.15.0

  Provides:       bundled(python3dist(vistir)) = 0.5.2
@@ -435,6 +435,9 @@ 

  %license LICENSE

  

  %changelog

+ * Tue Aug 25 2020 Tomas Orsava <torsava@redhat.com> - 2020.8.13-1

+ - Rebase to a new upstream version (#1868686)

+ 

  * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.6.2-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+1 -1
@@ -1,2 +1,2 @@ 

  SHA512 (pipenv-test-artifacts-1881ecb45431952d2e18e2be3416a8835e53778a.tar.gz) = 031a6e65b0b39d00a2ada1ff4949548fd693e469ed759b1035e0ca16fe92174e3fc004511319fe565d78824979673258ac977771174a4b3b83572a5504195eb8

- SHA512 (pipenv-2020.6.2.tar.gz) = 671765b9e77a18039668eb500989de45c8bd4f15948ee914eb241985098562ebd382168a535a449ac5d216f07327b6787eb8f828b5a6499ef6e77fe5a036441e

+ SHA512 (pipenv-2020.8.13.tar.gz) = 90ccaf386bc68d856ee9c645084cb65c4213902a8c87e2059cc2274b88d922c3b02c58c15d05945e1f61e8b816ef92a11672cadaf125143bd5019ab25ff0b19e

Resolves: rhbz#1868686

Diff looks reasonably simple :)

[pipenv (master %)]$ diff -u pipenv-2020.{6.2,8.13}/pipenv/vendor/vendor_pip.txt 
[pipenv (master %)]$ diff -u pipenv-2020.{6.2,8.13}/pipenv/vendor/vendor.txt 
--- pipenv-2020.6.2/pipenv/vendor/vendor.txt    2020-08-25 14:09:10.793494611 +0200
+++ pipenv-2020.8.13/pipenv/vendor/vendor.txt   2020-08-25 14:09:59.489842226 +0200
@@ -26,7 +26,7 @@
     idna==2.9
     urllib3==1.25.9
     certifi==2020.4.5.1
-requirementslib==1.5.11
+requirementslib==1.5.13
     attrs==19.3.0
     distlib==0.3.0
     packaging==20.3
@@ -39,7 +39,7 @@
 toml==0.10.1
 cached-property==1.5.1
 vistir==0.5.2
-pip-shims==0.5.2
+pip-shims==0.5.3
     contextlib2==0.6.0.post1
     funcsigs==1.0.2
 enum34==1.1.10
[pipenv (master %)]$ diff -u pipenv-2020.{6.2,8.13}/pipenv/patched/patched.txt

This also looks real.

Build failed.

Linter failed with:

pipenv.noarch: E: useless-provides bundled(python3dist(contextlib2))
pipenv.noarch: E: useless-provides bundled(python3dist(pep517))

These are declared twice on purpose, as they're bundled both for pip and pipenv.

rebased onto dd5348d

3 years ago

I've added an rpmlintrc file to ignore these errors.

Build succeeded.

Zuul is pleased, all hail the zuul!

I trust the CI here that it works. Ship it. Consider opening a Fedora 33 PR from the same branch as well and test it there before merging.

Pull-Request has been merged by torsava

3 years ago