PR#10: Merge branch 'master' into epel8 (for cheroot 8.5.1) - rpms/python-cheroot

rpms / python-cheroot

#10 Merge branch 'master' into epel8 (for cheroot 8.5.1)

Merged 3 years ago by radez. Opened 3 years ago by ktdreyer.

rpms/ ktdreyer/python-cheroot epel8-8.5.1 into epel8

Merge branch 'master' into epel8

Ken Dreyer • 3 years ago

73d17b7

add el8 support

Ken Dreyer • 3 years ago

0fe1c71

Merge #7 `use python3dist virtual provide for setuptools-scm-git-archive`

Dan Radez • 3 years ago

3c1c7eb

python-cheroot.spec

file modified

+12 -2

		`@@ -32,13 +32,20 @@`
		`BuildRequires: python3dist(pytest-cov)`
		`BuildRequires: python3dist(pytest-mock)`
		`BuildRequires: python3dist(jaraco.functools)`
		`+`
		`+ %if 0%{?el8}`
		`+ BuildRequires: python3dist(setuptools-scm)`
		`+ BuildRequires: python3dist(more-itertools) >= 2.6`
		`+ %else`
		`+ BuildRequires: python3dist(setuptools-scm-git-archive) >= 1.0`
		`+ %endif`
		`+`
		`# testmon is not needed to tests to run successfully`
		`# the f31 version of testmon requires pytest < 4`
		`# which is not in f31`
		`# BuildRequires: python3dist(pytest-testmon)`
		`BuildRequires: python3dist(requests)`
		`BuildRequires: python3dist(requests-unixsocket)`
		`- BuildRequires: python3-setuptools_scm_git_archive >= 1.0`
		`BuildRequires: python3dist(setuptools)`
		`BuildRequires: python3dist(trustme)`
		`%{?python_provide:%python_provide python3-%{pypi_name}}`
		`@@ -75,7 +82,10 @@`
		`sed -i 's/ --testmon//' pytest.ini`
		`sed -i 's/ -n auto//' pytest.ini`
		`sed -i '/pytest-testmon/d' setup.cfg`
		`-`
		`+ %if 0%{?el8}`
		`+ # drop setuptools_scm_git_archive`
		`+ sed -i '/setuptools_scm_git_archive/d' setup.cfg`
		`+ %endif`

		`%build`
		`%py3_build`

ktdreyer commented 3 years ago

This pull request merges all the changes in master into the epel8 branch.

This will allow us to build the latest upstream Cheroot version (8.5.1) for EPEL 8 and keep epel8 sync'd with master going forward.

ktdreyer commented 3 years ago

Note that due to the recent branch merges here, Pagure's web UI is only showing a small portion of the commits and the diff. Here's the full diffstat:

git diff origin/epel8 --stat
 .gitignore          |  5 +++++
 python-cheroot.spec | 32 +++++++++++++++++++++++++-------
 sources             |  3 +--
 3 files changed, 31 insertions(+), 9 deletions(-)

I'm thinking this is a Pagure UI bug.

Edited 3 years ago by ktdreyer

ktdreyer commented 3 years ago

@jcaratzas would you please merge this and build and push the update to Bodhi?