#10 F29: Sync with master (fast forward)
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.

file modified
+2
@@ -90,3 +90,5 @@ 

  /setuptools-38.4.0.zip

  /setuptools-39.0.1.zip

  /setuptools-39.2.0.zip

+ /setuptools-40.4.1.zip

+ /setuptools-40.4.3.zip

file modified
+30 -8
@@ -17,14 +17,17 @@ 

  %global python_wheeldir %{_datadir}/python-wheels

  

  Name:           python-setuptools

- Version:        39.2.0

- Release:        7%{?dist}

+ # When updating, update the bundled libraries versions bellow!

+ Version:        40.4.3

+ Release:        1%{?dist}

  Summary:        Easily build and distribute Python packages

- 

- Group:          Applications/System

- License:        MIT

+ # setuptools is MIT

+ # packaging is BSD or ASL 2.0

+ # pyparsing is MIT

+ # six is MIT

+ License:        MIT and (BSD or ASL 2.0)

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

- Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip

+ 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
@@ -78,11 +81,19 @@ 

  This package also contains the runtime components of setuptools, necessary to

  execute the software that requires pkg_resources.py.

  

+ # Virtual provides for the packages bundled by setuptools.

+ # You can find the versions in setuptools/setuptools/_vendor/vendored.txt

+ %global bundled() %{expand:

+ Provides: bundled(python%{1}dist(packaging)) = 16.8

+ Provides: bundled(python%{1}dist(pyparsing)) = 2.2.1

+ Provides: bundled(python%{1}dist(six)) = 1.10.0

+ }

  

  %if %{with python2}

  %package -n python2-setuptools

  Summary:        Easily build and distribute Python packages

  %{?python_provide:%python_provide python2-setuptools}

+ %{bundled 2}

  

  %description -n python2-setuptools

  Setuptools is a collection of enhancements to the Python distutils that allow
@@ -97,9 +108,9 @@ 

  

  %package -n python3-setuptools

  Summary:        Easily build and distribute Python 3 packages

- Group:          Applications/System

  %{?python_provide:%python_provide python3-setuptools}

  Obsoletes:      platform-python-setuptools < %{version}-%{release}

+ %{bundled 3}

  

  %description -n python3-setuptools

  Setuptools is a collection of enhancements to the Python 3 distutils that allow
@@ -112,6 +123,8 @@ 

  %if %{without bootstrap}

  %package wheel

  Summary:        The setuptools wheel

+ %{bundled 2}

+ %{bundled 3}

  

  %description wheel

  A Python wheel of setuptools to use with venv.
@@ -213,7 +226,7 @@ 

  # --ignore=setuptools/tests/test_virtualenv.py: because virtualenv executable

  #   is configured only for Python 2 version of virtualenv—this needs to be fixed

  #   in the `python-pytest-virtualenv` package

- PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore=setuptools/tests/test_virtualenv.py

+ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore=setuptools/tests/test_virtualenv.py --ignore=pavement.py

  %endif # with tests

  

  
@@ -245,6 +258,15 @@ 

  

  

  %changelog

+ * Mon Sep 24 2018 Miro Hrončok <mhroncok@redhat.com> - 40.4.3-1

+ - Update to 40.4.3 to fix dire DeprecationWarnings (#1627071)

+ - List vendored libraries

+ - https://github.com/pypa/setuptools/blob/v40.4.3/CHANGES.rst

+ 

+ * Wed Sep 19 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 40.4.1-1

+ - Update to 40.4.1 (#1599307).

+ - https://github.com/pypa/setuptools/blob/v40.4.1/CHANGES.rst

+ 

  * Wed Aug 15 2018 Petr Viktorin <pviktori@redhat.com> - 39.2.0-7

  - Add a subpackage with wheels

  - Remove the python3 bcond

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

- SHA512 (setuptools-39.2.0.zip) = 46baf6a48f93279d541ca10e0d71005565a7c9fbe4a8fe6b6378455edc57e5246bad3000ae9c9c47503a04e37816f9fa02e6c4328955ad16939c01c89c65d6b2

+ SHA512 (setuptools-40.4.3.zip) = ff4c0bb4a238a8788c533a8f22851e6b59b258c3096fba68a09e7450baf1ee47f47f86bfcd7339133b0445ec6b61fc7f0c08d7d6c4d2b231c29b724aa83d5998

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

+ ---

+ - hosts: localhost

+   roles:

+   - role: standard-test-basic

+     tags:

+     - classic

+     repositories:

+     - repo: "https://src.fedoraproject.org/tests/python.git"

+       dest: "python"

+     tests:

+     - smoke34:

+         dir: python/smoke

+         run: VERSION=3.4 ./venv.sh

+     - smoke35:

+         dir: python/smoke

+         run: VERSION=3.5 ./venv.sh

+     - smoke36:

+         dir: python/smoke

+         run: VERSION=3.6 ./venv.sh

+     - smoke37:

+         dir: python/smoke

+         run: VERSION=3.7 ./venv.sh

+     - smoke26:

+         dir: python/smoke

+         run: VERSION=2.6 METHOD=virtualenv TOX=false ./venv.sh

+     - smoke27:

+         dir: python/smoke

+         run: VERSION=2.7 METHOD=virtualenv ./venv.sh

+     - smoke34_virtualenv:

+         dir: python/smoke

+         run: VERSION=3.4 METHOD=virtualenv ./venv.sh

+     - smoke35_virtualenv:

+         dir: python/smoke

+         run: VERSION=3.5 METHOD=virtualenv ./venv.sh

+     - smoke36_virtualenv:

+         dir: python/smoke

+         run: VERSION=3.6 METHOD=virtualenv ./venv.sh

+     - smoke37_virtualenv:

+         dir: python/smoke

+         run: VERSION=3.7 METHOD=virtualenv ./venv.sh

+     required_packages:

+     - gcc

+     - /usr/bin/virtualenv

+     - python26

+     - python27

+     - python34

+     - python35

+     - python36

+     - python37

+     - python2-devel

+     - python3-devel

+     - python3-tox