From 8c049cbc10cf0cd139d436f22a1203e6d1195c90 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 4 Dec 2020 12:51:58 +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#aab7290eab68a65cbdc6505f3779d6ba2664b1b9 --- python-setuptools.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index d54bcb8..d228ca7 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,9 +1,20 @@ %global srcname setuptools +# The original RHEL 9 content set is defined by (build)dependencies +# of the packages in Fedora ELN. Hence we disable tests here +# to prevent pulling many unwanted packages in. +# Once the RHEL 9 content set is defined and/or RHEL 9 forks from ELN, +# the conditional can be removed from the Fedora spec file. +# We intentionally keep this enabled on EPEL. +%if 0%{?rhel} >= 9 && !0%{?epel} +%bcond_with tests +%else +%bcond_without tests +%endif + # WARNING When bootstrapping, disable tests as well, # because tests need pip. %bcond_with bootstrap -%bcond_without tests # Similar to what we have in pythonX.Y.spec files. # If enabled, provides unversioned executables and other stuff. # Disable it if you build this package in an alternative stack. @@ -18,7 +29,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! Version: 50.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT # appdirs is MIT @@ -33,10 +44,9 @@ Source0: %{pypi_source %{srcname} %{version} zip} BuildArch: noarch -BuildRequires: gcc - BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} +BuildRequires: gcc BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-mock @@ -189,6 +199,9 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py %changelog +* Fri Dec 4 2020 Miro Hrončok - 50.3.2-2 +- Disable tests in Fedora ELN (and RHEL) + * Tue Oct 20 2020 Tomas Hrnciar - 50.3.2-1 - Update to 50.3.2 (#1889093)