#8 Test with pytest 4, drop manual requires
Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.
rpms/ churchyard/python-requests pytest4  into  master

file modified
+15 -13
@@ -10,7 +10,7 @@ 

  

  Name:           python-requests

  Version:        2.23.0

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        HTTP library, written in Python, for human beings

  

  License:        ASL 2.0
@@ -50,20 +50,19 @@ 

  %{?python_provide:%python_provide python%{python3_pkgversion}-requests}

  

  BuildRequires:  python%{python3_pkgversion}-devel

- BuildRequires:  python%{python3_pkgversion}-chardet

- BuildRequires:  python%{python3_pkgversion}-urllib3

- BuildRequires:  python%{python3_pkgversion}-idna

- BuildRequires:  python%{python3_pkgversion}-pygments

+ BuildRequires:  python3dist(chardet)

+ BuildRequires:  python3dist(urllib3)

+ BuildRequires:  python3dist(idna)

+ BuildRequires:  python3dist(pygments)

+ BuildRequires:  python3dist(setuptools)

  %if %{with tests}

- BuildRequires:  python%{python3_pkgversion}-pytest

- BuildRequires:  python%{python3_pkgversion}-pytest-cov

- BuildRequires:  python%{python3_pkgversion}-pytest-httpbin

- BuildRequires:  python%{python3_pkgversion}-pytest-mock

+ # https://github.com/psf/requests/issues/5304 (fixed in master)

+ BuildRequires:  python3dist(pytest) < 5

+ BuildRequires:  python3dist(pytest-cov)

+ BuildRequires:  python3dist(pytest-httpbin)

+ BuildRequires:  python3dist(pytest-mock)

  %endif

  

- Requires:       python%{python3_pkgversion}-chardet >= 3.0.2

- Requires:       python%{python3_pkgversion}-urllib3 >= 1.21.1

- Requires:       python%{python3_pkgversion}-idna

  

  %description -n python%{python3_pkgversion}-requests

  Most existing Python modules for sending HTTP requests are extremely verbose and
@@ -101,11 +100,14 @@ 

  %files -n python%{python3_pkgversion}-requests

  %license LICENSE

  %doc README.md HISTORY.md

- %{python3_sitelib}/*.egg-info

+ %{python3_sitelib}/*.egg-info/

  %{python3_sitelib}/requests/

  

  

  %changelog

+ * Sat May 30 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-4

+ - Test with pytest 4, drop manual requires

+ 

  * Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-3

  - Rebuilt for Python 3.9

  

Also explicitly BR setuptools, assert egg-info is a directory.

Replace %{python3_pkgversion} with 3, because this package is retired in epel7
and the above changes are not EPEL 6/7 compatible anyway.

%{python3_pkgversion} can be useful later on in new EL, so I personally wouldn't remove it. But it can just as easily be added back later.

LGTM.

rebased onto 11e90b9

3 years ago

I've dropped the %{python3_pkgversion} change. Even in future rhels, this won't wok with pyhon3dist BRs as they are now, but at least the diff is smaller now.

Pull-Request has been merged by churchyard

3 years ago