#34 Upgrade to 46.1.3
Merged 3 months ago by churchyard. Opened 4 months ago by churchyard.
rpms/ churchyard/python-setuptools 46.1.2  into  master

@@ -1,17 +0,0 @@ 

- diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py

- index 91c48b3..0c9b0f4 100755

- --- a/setuptools/command/easy_install.py

- +++ b/setuptools/command/easy_install.py

- @@ -446,6 +446,12 @@ class easy_install(Command):

-          instdir = normalize_path(self.install_dir)

-          pth_file = os.path.join(instdir, 'easy-install.pth')

-  

- +        if not os.path.exists(instdir):

- +            try:

- +                os.makedirs(instdir)

- +            except (OSError, IOError):

- +                self.cant_write_to_target()

- +

-          # Is it a configured, PYTHONPATH, implicit, or explicit site dir?

-          is_site_dir = instdir in self.all_site_dirs

-  

file modified
+6 -7

@@ -13,7 +13,7 @@ 

  

  Name:           python-setuptools

  # When updating, update the bundled libraries versions bellow!

- Version:        46.0.0

+ Version:        46.1.3

  Release:        1%{?dist}

  Summary:        Easily build and distribute Python packages

  # setuptools is MIT

@@ -25,12 +25,6 @@ 

  URL:            https://pypi.python.org/pypi/%{srcname}

  Source0:        %{pypi_source %{srcname} %{version} zip}

  

- # In Fedora, sudo setup.py install installs to /usr/local/lib/pythonX.Y/site-packages

- # But pythonX doesn't own that dir, that would be against FHS

- # We need to create it if it doesn't exist

- # https://bugzilla.redhat.com/show_bug.cgi?id=1576924

- Patch0:         create-site-packages.patch

- 

  BuildArch:      noarch

  

  BuildRequires:  gcc

@@ -178,8 +172,13 @@ 

  

  

  %changelog

+ * Thu Mar 26 2020 Miro Hrončok <mhroncok@redhat.com> - 46.1.3-1

+ - Upgrade to 46.1.3 (#1817189)

+ - https://setuptools.readthedocs.io/en/latest/history.html#v46-1-3

Does it make sense to link to empty changelog?

It contains also information about the previous versions included here.

+ 

  * Tue Mar 10 2020 Miro Hrončok <mhroncok@redhat.com> - 46.0.0-1

  - Upgrade to 46.0.0 (#1811340)

+ - https://setuptools.readthedocs.io/en/latest/history.html#v46-0-0

  

  * Tue Feb 11 2020 Miro Hrončok <mhroncok@redhat.com> - 45.2.0-1

  - Upgrade to 45.2.0 (#1775943)

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (setuptools-46.0.0.zip) = 3d398a69d4b3cceac33c3ecb36c7bfdc5e11160b5179e2097e75527cb2e50e2baed649ccfde3967330806d62726092de29cc572d0bb213691aa43a665ca6efa5

+ SHA512 (setuptools-46.1.3.zip) = 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1815796

The create-site-packages.patch was merged upstream.

I've only tested if it builds, so let's see how the CI responds.

46.1.3 just got out, will update, don't merge.

rebased onto 1bbe4f8

4 months ago

Build succeeded.

The Fedora CI Jenkins job failed with:

gcc -pthread -Wno-unused-result -Wsign-compare -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DNDEBUG -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -D_GNU_SOURCE -fPIC -fwrapv -fPIC -I/var/str/python/smoke/venv/include -I/usr/include/python3.5m -c module.c -o build/temp.linux-x86_64-3.5/module.o
annobin: module.c: ICE: The location of the "-fstack-clash-protection" flag has changed - please rebuild annobin
annobin: module.c: ICE: Please contact the annobin maintainer with details of this problem
annobin: module.c: Build time offset: 1118.  Run time offset: ffff
annobin: module.c: Expeceted name: -fstack-clash-protection.  Actual name: -fstack-check=

This is probably just some annobin/gcc version clash. Zuul CI passed.

Does it make sense to link to empty changelog?

Diff looks good to me! +1

It contains also information about the previous versions included here.

Pull-Request has been merged by churchyard

3 months ago