#2 conditionally require pytest 3.5 for fedora
Merged 4 years ago by radez. Opened 4 years ago by adeza.
rpms/ adeza/python-jaraco-classes master  into  master

file modified
+2 -2
@@ -25,7 +25,7 @@ 

  BuildConflicts: python3dist(pytest) = 3.7.3

  BuildRequires:  python3-devel

  BuildRequires:  python3dist(pytest) >= 3.4

- BuildRequires:  python3dist(pytest-flake8)

+ 

  BuildRequires:  python3dist(setuptools)

  BuildRequires:  python3dist(setuptools-scm) >= 1.15

  
@@ -93,7 +93,7 @@ 

  * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-6

  - Rebuilt for Python 3.8.0rc1 (#1748018)

  

- * Tue Aug 22 2019 Dan Radez <dradez@redhat.com> - 2.0-5

+ * Thu Aug 22 2019 Dan Radez <dradez@redhat.com> - 2.0-5

  - Removing the sed . to _ it's confusing and not needed

  

  * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-4

Similar to https://src.fedoraproject.org/rpms/python-jaraco-classes/pull-request/1# but conditionally setting things to fedora only. EPEL8 has pytest at version 3.4 only. And there are no tests in python-jaraco-classes

Actually, I am going to have to revise this PR. I was able to build correctly without the if condition.

rebased onto 85415bc

4 years ago

The new changes allows this to be built without problems. Flake8 is not needed as the spec file is already removing that flag, and Pytest 3.4 (available as part of Centos8) works fine.

1 new commit added

  • fix bogus date in changelog
4 years ago

I think you'll have to rebase this PR from Ken's earlier PR.

Apologies I didn't see that #1 was closed before I merged it.

ahhhh, ok, no worries, I will rebase this from Ken's.

rebased onto 8c9df24

4 years ago

@radez do you need me to update the changelog as well? Or is this good as-is?

Pull-Request has been merged by radez

4 years ago

I don't think there's any need.