From f46f6b3f3c9a85e9a1b57a4f6adcb16814f24662 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 12 Jan 2021 16:17:13 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/python-setuptools.git#7be6637b2ea2a581148c5956213cfb8e0ee3aec0 --- python-setuptools.spec | 12 +++++++++++- sources | 2 +- tests/tests.yml | 19 +++++++++++++------ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 1c6550f..316ccba 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -28,7 +28,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 51.1.1 +Version: 51.1.2 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -168,6 +168,10 @@ rm %{buildroot}%{_bindir}/easy_install # Verify bundled provides are up to date %{_rpmconfigdir}/pythonbundles.py pkg_resources/_vendor/vendored.txt --compare-with '%{bundled}' +# Regression test, the wheel should not be larger than 600 KiB +# https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3 +test $(du dist/%{python_wheelname} | cut -f1) -lt 600 + # Upstream tests # --ignore=pavement.py: # pavement.py is only used by upstream to do releases and vendoring, we don't ship it @@ -199,6 +203,12 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py %changelog +* Mon Jan 11 2021 Miro Hrončok - 51.1.2-1 +- Update to 51.1.2 +- Removes tests from the wheel +- https://setuptools.readthedocs.io/en/latest/history.html#v51-1-2 +- Fixes: rhbz#1914481 + * Tue Dec 29 2020 Miro Hrončok - 51.1.1-1 - Update to 51.1.1 - Fixes test failures with pip 20.3 as well as with pytest 6.2+ diff --git a/sources b/sources index e75eacc..ca9edff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-51.1.1.tar.gz) = ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7 +SHA512 (setuptools-51.1.2.tar.gz) = cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f diff --git a/tests/tests.yml b/tests/tests.yml index 559f4b3..daeea31 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -28,6 +28,9 @@ - smoke39: dir: python/smoke run: VERSION=3.9 ./venv.sh + - smoke310: + dir: python/smoke + run: VERSION=3.10 ./venv.sh - smoke27: dir: python/smoke run: VERSION=2.7 METHOD=virtualenv ./venv.sh @@ -49,6 +52,9 @@ - smoke39_virtualenv: dir: python/smoke run: VERSION=3.9 METHOD=virtualenv ./venv.sh + - smoke310_virtualenv: + dir: python/smoke + run: VERSION=3.10 METHOD=virtualenv ./venv.sh - pyproject_pytest: dir: pyproject-rpm-macros/tests run: ./mocktest.sh python-pytest @@ -58,12 +64,13 @@ required_packages: - gcc - virtualenv - - python27 - - python35 - - python36 - - python37 - - python38 - - python39 + - python2.7 + - python3.5 + - python3.6 + - python3.7 + - python3.8 + - python3.9 + - python3.10 - python3-devel - python3-tox - mock