#1 Make it build with pytest 4 (#1694205), drop manual requires
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.
rpms/ churchyard/python-pytest-fixture-config pytest4  into  master

@@ -3,7 +3,7 @@ 

  

  Name:           python-%{srcname}

  Version:        1.4.0

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        %{sum}

  

  License:        MIT
@@ -23,7 +23,6 @@ 

  %package -n python2-%{srcname}

  Summary:        %{sum}

  %{?python_provide:%python_provide python2-%{srcname}}

- Requires:  python2-pytest

  

  %description -n python2-%{srcname}

  Simple configuration objects for Py.test fixtures.
@@ -32,7 +31,6 @@ 

  %package -n python3-%{srcname}

  Summary:        %{sum}

  %{?python_provide:%python_provide python3-%{srcname}}

- Requires: python3-pytest

  

  %description -n python3-%{srcname}

  Simple configuration objects for Py.test fixtures.
@@ -41,6 +39,10 @@ 

  %prep

  %autosetup -n %{srcname}-%{version}

  

+ # https://bugzilla.redhat.com/show_bug.cgi?id=1694205

+ # https://github.com/manahl/pytest-plugins/pull/134

+ sed -i "s/'pytest<4.0.0'/'pytest'/" setup.py

+ 

  %build

  %py2_build

  %py3_build
@@ -62,6 +64,9 @@ 

  %{python3_sitelib}/*

  

  %changelog

+ * Fri Apr 12 2019 Miro Hrončok <mhroncok@redhat.com> - 1.4.0-2

+ - Make the package installable with pytest 4

+ 

  * Sun Mar 10 2019 Kevin Fenzi <kevin@scrye.com> - 1.4.0-1

  - Update to 1.4.0. 

  - Fix FTBFS, bug #1675781

no initial comment

+1. let me know if you want me to merge/build or if you will do it.

python3-pytest-fixture-config requires python3.7dist(pytest) < 4.0.0, so a rebuild makes sense. I'll add a changelog entry and build.

rebased onto 5b8958b

5 years ago

Pull-Request has been merged by churchyard

5 years ago