pool/python-setuptools_scm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 693663 from devel:languages:python

Browse Source 
- fix add-rpmfail-pytest-markers.patch to build for older distros

OBS-URL: https://build.opensuse.org/request/show/693663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-setuptools_scm?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2019-04-19 16:36:37 +00:00 committed by Git OBS Bridge
commit b5583567f1
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
add-rpmfail-pytest-markers.patch
View File

@ -1,7 +1,8 @@
diff -ru setuptools_scm-3.2.0-orig/testing/test_regressions.py setuptools_scm-3.2.0/testing/test_regressions.py
--- setuptools_scm-3.2.0-orig/testing/test_regressions.py 2019-01-17 02:34:04.000000000 +0700
+++ setuptools_scm-3.2.0/testing/test_regressions.py 2019-03-15 13:15:33.248842438 +0700
@@ -49,6 +49,7 @@
Index: setuptools_scm-3.2.0/testing/test_regressions.py
===================================================================
--- setuptools_scm-3.2.0.orig/testing/test_regressions.py
+++ setuptools_scm-3.2.0/testing/test_regressions.py
@@ -49,6 +49,7 @@ def test_pip_egg_info(tmpdir, monkeypatc
assert get_version(root=p.strpath) == "1.0"
@ -9,10 +10,11 @@ diff -ru setuptools_scm-3.2.0-orig/testing/test_regressions.py setuptools_scm-3.
@pytest.mark.issue(164)
def test_pip_download(tmpdir, monkeypatch):
monkeypatch.chdir(tmpdir)
diff -ru setuptools_scm-3.2.0-orig/testing/test_setuptools_support.py setuptools_scm-3.2.0/testing/test_setuptools_support.py
--- setuptools_scm-3.2.0-orig/testing/test_setuptools_support.py 2019-01-17 02:34:04.000000000 +0700
+++ setuptools_scm-3.2.0/testing/test_setuptools_support.py 2019-03-15 13:16:43.573444176 +0700
@@ -65,12 +65,14 @@
Index: setuptools_scm-3.2.0/testing/test_setuptools_support.py
===================================================================
--- setuptools_scm-3.2.0.orig/testing/test_setuptools_support.py
+++ setuptools_scm-3.2.0/testing/test_setuptools_support.py
@@ -65,12 +65,14 @@ def check(packagedir, expected_version,
)
@ -27,7 +29,7 @@ diff -ru setuptools_scm-3.2.0-orig/testing/test_setuptools_support.py setuptools
def test_old_setuptools_allows_with_warnings(get_setuptools_packagedir):
packagedir = get_setuptools_packagedir("0.9.8")
@@ -78,6 +80,7 @@
@@ -78,6 +80,7 @@ def test_old_setuptools_allows_with_warn
check(packagedir, "0.9.8", PYTHONWARNINGS="once::Warning")

5
python-setuptools_scm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 12 08:33:01 UTC 2019 - Dirk Mueller <dmueller@suse.com>
- fix add-rpmfail-pytest-markers.patch to build for older distros
-------------------------------------------------------------------
Tue Apr 2 14:47:52 CEST 2019 - Matej Cepl <mcepl@suse.com>

1
python-setuptools_scm.spec
View File

@ -61,7 +61,6 @@ in SCM metadata. It also handles file finders for the supperted SCMs.
%prep
%setup -q -n setuptools_scm-%{version}
%autopatch -p1
rm tox.ini
%build
%python_build