From 9d511ca1c92a13199f31bf6ef06229db2aa11c5a Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jul 27 2018 12:40:21 +0000 Subject: [PATCH 1/14] Fix couple of rpmlint issues --- diff --git a/python-setuptools.spec b/python-setuptools.spec index 98562c9..ac3dd2f 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -144,11 +144,13 @@ execute the software that requires pkg_resources.py. # otherwise setuptools are installed as dependency into buildroot # Strip shbang -find setuptools -name \*.py | xargs sed -i -e '1 {/^#!\//d}' +find setuptools pkg_resources -name \*.py | xargs sed -i -e '1 {/^#!\//d}' # Remove bundled exes rm -f setuptools/*.exe # These tests require internet connection rm setuptools/tests/test_integration.py +# Spurious executable perm https://github.com/pypa/setuptools/pull/1441 +chmod -x README.rst %build %if %{with python2} From 4d41ef086a4daa01d2a00cd25ecaa0bfd40f62c9 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Aug 15 2018 13:43:51 +0000 Subject: [PATCH 2/14] Remove the python3 bcond There is no point of building this without python3 any more, and this makes the spec a bit more readable. Also, remove macros for RHEL 6 --- diff --git a/python-setuptools.spec b/python-setuptools.spec index ac3dd2f..255ab66 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -5,17 +5,7 @@ %bcond_with bootstrap %bcond_without tests -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global _without_python3 1 -# define some macros for RHEL 6 -%global __python2 %__python -%global python2_sitelib %python_sitelib -%endif - -# Note(hguemar): overrides must be placed *before* those -# Otherwise it doesn't work %bcond_without python2 -%bcond_without python3 %if %{without bootstrap} %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl @@ -23,15 +13,13 @@ %global python2_wheelname %python_wheelname %global python2_record %{python2_sitelib}/%{srcname}-%{version}.dist-info/RECORD %endif -%if %{with python3} %global python3_wheelname %python_wheelname %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD %endif -%endif Name: python-setuptools Version: 39.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -64,7 +52,6 @@ BuildRequires: python2-pytest-virtualenv %endif # with tests %endif # with python2 -%if %{with python3} BuildRequires: python3-devel %if %{with tests} BuildRequires: python3-pip @@ -77,7 +64,6 @@ BuildRequires: python3-pytest-virtualenv BuildRequires: python3-pip BuildRequires: python3-wheel %endif # without bootstrap -%endif # with python3 # We're now back to setuptools as the package. # Keep the python-distribute name active for a few releases. Eventually we'll @@ -110,7 +96,6 @@ execute the software that requires pkg_resources.py. %endif # with python2 -%if %{with python3} %package -n python3-setuptools Summary: Easily build and distribute Python 3 packages Group: Applications/System @@ -125,8 +110,6 @@ have dependencies on other packages. This package also contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. -%endif # with python3 - %prep %autosetup -p1 -n %{srcname}-%{version} @@ -161,20 +144,17 @@ chmod -x README.rst %endif %endif # with python2 -%if %{with python3} %if %{without bootstrap} %py3_build_wheel %else %py3_build %endif -%endif # with python3 %install # Must do the python3 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version to -# be the default for now). -%if %{with python3} +# overwritten with every setup.py install (and we want /usr/bin/pip to be +# the python2 version). %if %{without bootstrap} %py3_install_wheel %{python3_wheelname} @@ -194,7 +174,6 @@ sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record} %endif find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f -%endif # with python3 %if %{with python2} @@ -223,12 +202,10 @@ rm -r docs/{Makefile,conf.py,_*} PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python2_version} %endif # with python2 -%if %{with python3} # --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 -%endif # with python3 %endif # with tests @@ -241,7 +218,6 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %{_bindir}/easy_install-2.* %endif # with python2 -%if %{with python3} %files -n python3-setuptools %license LICENSE %doc docs/* CHANGES.rst README.rst @@ -250,10 +226,13 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %{python3_sitelib}/setuptools*/ %{python3_sitelib}/__pycache__/* %{_bindir}/easy_install-3.* -%endif # with python3 %changelog +* Wed Aug 15 2018 Petr Viktorin - 39.2.0-7 +- Remove the python3 bcond +- Remove macros for RHEL 6 + * Thu Jul 19 2018 Miro Hrončok - 39.2.0-6 - Create /usr/local/lib/pythonX.Y when needed (#1576924) From d7f5288145581041ee77d43819e7fb39e6bc8884 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Aug 15 2018 13:43:57 +0000 Subject: [PATCH 3/14] Add a subpackage with wheels Use a common python_wheelname for both Pytohn versions --- diff --git a/python-setuptools.spec b/python-setuptools.spec index 255ab66..f0dc153 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -10,12 +10,11 @@ %if %{without bootstrap} %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl %if %{with python2} -%global python2_wheelname %python_wheelname %global python2_record %{python2_sitelib}/%{srcname}-%{version}.dist-info/RECORD %endif -%global python3_wheelname %python_wheelname %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD %endif +%global python_wheeldir %{_datadir}/python-wheels Name: python-setuptools Version: 39.2.0 @@ -110,6 +109,14 @@ have dependencies on other packages. This package also contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. +%if %{without bootstrap} +%package wheel +Summary: The setuptools wheel + +%description wheel +A Python wheel of setuptools to use with venv. +%endif + %prep %autosetup -p1 -n %{srcname}-%{version} @@ -136,17 +143,13 @@ rm setuptools/tests/test_integration.py chmod -x README.rst %build -%if %{with python2} %if %{without bootstrap} -%py2_build_wheel +%py3_build_wheel %else +%if %{with python2} %py2_build -%endif %endif # with python2 -%if %{without bootstrap} -%py3_build_wheel -%else %py3_build %endif @@ -156,7 +159,7 @@ chmod -x README.rst # overwritten with every setup.py install (and we want /usr/bin/pip to be # the python2 version). %if %{without bootstrap} -%py3_install_wheel %{python3_wheelname} +%py3_install_wheel %{python_wheelname} # Remove /usr/bin/easy_install from the record as later on we delete the file sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python3_record} @@ -178,7 +181,7 @@ find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f %if %{with python2} %if %{without bootstrap} -%py2_install_wheel %{python2_wheelname} +%py2_install_wheel %{python_wheelname} %else %py2_install %endif @@ -194,6 +197,11 @@ find %{buildroot}%{python2_sitelib} -name '*.exe' | xargs rm -f # Don't ship these rm -r docs/{Makefile,conf.py,_*} +%if %{without bootstrap} +mkdir -p %{buildroot}%{python_wheeldir} +install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} +%endif + %if %{with tests} %check @@ -227,9 +235,18 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %{python3_sitelib}/__pycache__/* %{_bindir}/easy_install-3.* +%if %{without bootstrap} +%files wheel +%license LICENSE +# we own the dir for simplicity +%dir %{python_wheeldir}/ +%{python_wheeldir}/%{python_wheelname} +%endif + %changelog * Wed Aug 15 2018 Petr Viktorin - 39.2.0-7 +- Add a subpackage with wheels - Remove the python3 bcond - Remove macros for RHEL 6 From fee43c1726966ded0e8385ff681f780c6dd145ec Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 04 2018 10:03:25 +0000 Subject: [PATCH 4/14] Enable basic venv smoke test in the CI --- diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..676a94f --- /dev/null +++ b/tests/tests.yml @@ -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 From 7b33de4867ebb80679daabd4073fb9b68176053b Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Sep 19 2018 17:47:56 +0000 Subject: [PATCH 5/14] Update to 40.4.1 (#1599307). Signed-off-by: Randy Barlow --- diff --git a/.gitignore b/.gitignore index fa18fc7..a04e8f5 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /setuptools-38.4.0.zip /setuptools-39.0.1.zip /setuptools-39.2.0.zip +/setuptools-40.4.1.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index f0dc153..4b0414c 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,8 +17,8 @@ %global python_wheeldir %{_datadir}/python-wheels Name: python-setuptools -Version: 39.2.0 -Release: 7%{?dist} +Version: 40.4.1 +Release: 1%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -213,7 +213,7 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python2_version} # --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 +245,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Wed Sep 19 2018 Randy Barlow - 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 - 39.2.0-7 - Add a subpackage with wheels - Remove the python3 bcond diff --git a/sources b/sources index 884d96c..31494ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-39.2.0.zip) = 46baf6a48f93279d541ca10e0d71005565a7c9fbe4a8fe6b6378455edc57e5246bad3000ae9c9c47503a04e37816f9fa02e6c4328955ad16939c01c89c65d6b2 +SHA512 (setuptools-40.4.1.zip) = 36e26eabda1c205e051cc1100c7568064b52a4dfec0992743bcfb50350097f9bc82cb9f566980ca764ada036a2e25482123b6fc5c0688cbd09427cf46988c46a From 818fa297400a8c3050a17dcb1079b5b762c86efb Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 24 2018 13:33:58 +0000 Subject: [PATCH 6/14] Update to 40.4.3 - fix dire DeprecationWarnings (#1627071) - list vendored libraries, adjust license --- diff --git a/.gitignore b/.gitignore index a04e8f5..8be4855 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /setuptools-39.0.1.zip /setuptools-39.2.0.zip /setuptools-40.4.1.zip +/setuptools-40.4.3.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index 4b0414c..da02737 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,14 +17,17 @@ %global python_wheeldir %{_datadir}/python-wheels Name: python-setuptools -Version: 40.4.1 +# 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 @@ have dependencies on other packages. 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 @@ execute the software that requires pkg_resources.py. %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 @@ execute the software that requires pkg_resources.py. %if %{without bootstrap} %package wheel Summary: The setuptools wheel +%{bundled 2} +%{bundled 3} %description wheel A Python wheel of setuptools to use with venv. @@ -245,6 +258,11 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Mon Sep 24 2018 Miro Hrončok - 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 - 40.4.1-1 - Update to 40.4.1 (#1599307). - https://github.com/pypa/setuptools/blob/v40.4.1/CHANGES.rst diff --git a/sources b/sources index 31494ec..3c216aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.4.1.zip) = 36e26eabda1c205e051cc1100c7568064b52a4dfec0992743bcfb50350097f9bc82cb9f566980ca764ada036a2e25482123b6fc5c0688cbd09427cf46988c46a +SHA512 (setuptools-40.4.3.zip) = ff4c0bb4a238a8788c533a8f22851e6b59b258c3096fba68a09e7450baf1ee47f47f86bfcd7339133b0445ec6b61fc7f0c08d7d6c4d2b231c29b724aa83d5998 From 99188dc1ea8b28a1a187e9c6e1e0b8ff86bf87f7 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 28 2019 15:45:45 +0000 Subject: [PATCH 7/14] Update to 40.7.0 (#1669876) The Python 2 version now needs python2-futures for tests. I've removed very old obsoletes/provides of the main package, they were not applied (we only ship subpackages). --- diff --git a/.gitignore b/.gitignore index 8be4855..010ccba 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /setuptools-39.2.0.zip /setuptools-40.4.1.zip /setuptools-40.4.3.zip +/setuptools-40.7.0.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index da02737..82cbe3e 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -18,7 +18,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 40.4.3 +Version: 40.7.0 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -45,6 +45,7 @@ BuildRequires: python2-pip BuildRequires: python2-wheel %endif # without bootstrap %if %{with tests} +BuildRequires: python2-futures BuildRequires: python2-pip BuildRequires: python2-pytest BuildRequires: python2-mock @@ -67,12 +68,6 @@ BuildRequires: python3-pip BuildRequires: python3-wheel %endif # without bootstrap -# We're now back to setuptools as the package. -# Keep the python-distribute name active for a few releases. Eventually we'll -# want to get rid of the Provides and just keep the Obsoletes -Provides: python-distribute = %{version}-%{release} -Obsoletes: python-distribute < 0.6.36-2 - %description Setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that @@ -258,6 +253,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Mon Jan 28 2019 Miro Hrončok - 40.7.0-1 +- Update to 40.7.0 (#1669876) +- https://github.com/pypa/setuptools/blob/v40.7.0/CHANGES.rst + * Mon Sep 24 2018 Miro Hrončok - 40.4.3-1 - Update to 40.4.3 to fix dire DeprecationWarnings (#1627071) - List vendored libraries diff --git a/sources b/sources index 3c216aa..c04fbdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.4.3.zip) = ff4c0bb4a238a8788c533a8f22851e6b59b258c3096fba68a09e7450baf1ee47f47f86bfcd7339133b0445ec6b61fc7f0c08d7d6c4d2b231c29b724aa83d5998 +SHA512 (setuptools-40.7.0.zip) = a360461f70222f1de859a8920d8f8e1257eb47f25a481c0d4a3435f74dc5aef4fd2e2fab5285173777483b1b23e7e203617073d753461373ad1c4768e5ce8aba From 968ef33023a0be73397ac71fa61ad8bd29f7e348 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 29 2019 07:53:17 +0000 Subject: [PATCH 8/14] Hotfix update to 40.7.1 (#1670243) --- diff --git a/.gitignore b/.gitignore index 010ccba..1637421 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /setuptools-40.4.1.zip /setuptools-40.4.3.zip /setuptools-40.7.0.zip +/setuptools-40.7.1.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index 82cbe3e..62da32f 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -18,7 +18,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 40.7.0 +Version: 40.7.1 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -253,6 +253,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Tue Jan 29 2019 Miro Hrončok - 40.7.1-1 +- Hotfix update to 40.7.1 (#1670243) + * Mon Jan 28 2019 Miro Hrončok - 40.7.0-1 - Update to 40.7.0 (#1669876) - https://github.com/pypa/setuptools/blob/v40.7.0/CHANGES.rst diff --git a/sources b/sources index c04fbdd..a67b122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.7.0.zip) = a360461f70222f1de859a8920d8f8e1257eb47f25a481c0d4a3435f74dc5aef4fd2e2fab5285173777483b1b23e7e203617073d753461373ad1c4768e5ce8aba +SHA512 (setuptools-40.7.1.zip) = 384d38afa56409f828cf26443271514feaf82b1d9d99a4a0bb4a9004f9b7a262a0d5ae48905e808381074e948988417e3f7e81a84dcd09359f9185a2305f8cac From 799b8302a55951ea23b0d7f42a28d08f17d2c0f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Feb 02 2019 09:16:42 +0000 Subject: [PATCH 9/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-setuptools.spec b/python-setuptools.spec index 62da32f..d222d6e 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -19,7 +19,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! Version: 40.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT # packaging is BSD or ASL 2.0 @@ -253,6 +253,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 40.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 29 2019 Miro Hrončok - 40.7.1-1 - Hotfix update to 40.7.1 (#1670243) From 5c0280dd621ec0391167aa42df3bc7db99252631 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 03 2019 19:02:18 +0000 Subject: [PATCH 10/14] Hotfix update to 40.7.2 (#1671608) --- diff --git a/.gitignore b/.gitignore index 1637421..9907b33 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /setuptools-40.4.3.zip /setuptools-40.7.0.zip /setuptools-40.7.1.zip +/setuptools-40.7.2.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index d222d6e..cea34c9 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -18,8 +18,8 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 40.7.1 -Release: 2%{?dist} +Version: 40.7.2 +Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT # packaging is BSD or ASL 2.0 @@ -253,6 +253,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Sat Feb 02 2019 Miro Hrončok - 40.7.2-1 +- Hotfix update to 40.7.2 (#1671608) + * Sat Feb 02 2019 Fedora Release Engineering - 40.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a67b122..f82d75d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.7.1.zip) = 384d38afa56409f828cf26443271514feaf82b1d9d99a4a0bb4a9004f9b7a262a0d5ae48905e808381074e948988417e3f7e81a84dcd09359f9185a2305f8cac +SHA512 (setuptools-40.7.2.zip) = f3e2fd9c3712297ac07a93043334854d3c5d8bee6e5685dc0a2d2dbf1a44831a0b818e5a72e5b5c35b8a25db6886cd3cc3430836a5f444c6fbc9aad4a6b5e5f3 From 0bc8110fff6039ec240eed8d0844295bfc620ad7 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 03 2019 19:02:18 +0000 Subject: [PATCH 11/14] Add missing upstream's changelog links to %changelog --- diff --git a/python-setuptools.spec b/python-setuptools.spec index cea34c9..e5074bb 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -255,12 +255,14 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog * Sat Feb 02 2019 Miro Hrončok - 40.7.2-1 - Hotfix update to 40.7.2 (#1671608) +- https://github.com/pypa/setuptools/blob/v40.7.2/CHANGES.rst * Sat Feb 02 2019 Fedora Release Engineering - 40.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Tue Jan 29 2019 Miro Hrončok - 40.7.1-1 - Hotfix update to 40.7.1 (#1670243) +- https://github.com/pypa/setuptools/blob/v40.7.1/CHANGES.rst * Mon Jan 28 2019 Miro Hrončok - 40.7.0-1 - Update to 40.7.0 (#1669876) From 1201c7062fff3ee27896a95417bb121510f04cf7 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 03 2019 19:02:52 +0000 Subject: [PATCH 12/14] Hotfix update to 40.7.3 (#1672084) --- diff --git a/.gitignore b/.gitignore index 9907b33..5e99a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ /setuptools-40.7.0.zip /setuptools-40.7.1.zip /setuptools-40.7.2.zip +/setuptools-40.7.3.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index e5074bb..15c2d17 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -18,7 +18,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 40.7.2 +Version: 40.7.3 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -253,6 +253,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Sun Feb 03 2019 Miro Hrončok - 40.7.3-1 +- Hotfix update to 40.7.3 (#1672084) +- https://github.com/pypa/setuptools/blob/v40.7.3/CHANGES.rst + * Sat Feb 02 2019 Miro Hrončok - 40.7.2-1 - Hotfix update to 40.7.2 (#1671608) - https://github.com/pypa/setuptools/blob/v40.7.2/CHANGES.rst diff --git a/sources b/sources index f82d75d..5f774cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.7.2.zip) = f3e2fd9c3712297ac07a93043334854d3c5d8bee6e5685dc0a2d2dbf1a44831a0b818e5a72e5b5c35b8a25db6886cd3cc3430836a5f444c6fbc9aad4a6b5e5f3 +SHA512 (setuptools-40.7.3.zip) = fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65 From 16c85a91b351728b2dec5267bf5d2d129c3331d9 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 05 2019 20:04:51 +0000 Subject: [PATCH 13/14] Update to 40.8.0 (#1672756) --- diff --git a/.gitignore b/.gitignore index 5e99a8c..db4716d 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /setuptools-40.7.1.zip /setuptools-40.7.2.zip /setuptools-40.7.3.zip +/setuptools-40.8.0.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index 15c2d17..32ee9be 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -18,7 +18,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 40.7.3 +Version: 40.8.0 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -253,6 +253,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Tue Feb 05 2019 Miro Hrončok +- Update to 40.8.0 (#1672756) +- https://github.com/pypa/setuptools/blob/v40.8.0/CHANGES.rst + * Sun Feb 03 2019 Miro Hrončok - 40.7.3-1 - Hotfix update to 40.7.3 (#1672084) - https://github.com/pypa/setuptools/blob/v40.7.3/CHANGES.rst diff --git a/sources b/sources index 5f774cb..1d4eca4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.7.3.zip) = fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65 +SHA512 (setuptools-40.8.0.zip) = f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868 From 71f27d930c8aafdc721c88d863ab03b588afcafe Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 01 2019 10:12:16 +0000 Subject: [PATCH 14/14] Fedora CI: Workaround for fedora-ci/general #31 https://pagure.io/fedora-ci/general/issue/31 --- diff --git a/tests/tests.yml b/tests/tests.yml index 676a94f..f078218 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -40,7 +40,7 @@ run: VERSION=3.7 METHOD=virtualenv ./venv.sh required_packages: - gcc - - /usr/bin/virtualenv + - virtualenv - python26 - python27 - python34