From 5f13d9d6e2e43fc8b51731e5f22b0f03c54f7cc39b2f50da4829b028925e7653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 22 Jul 2019 08:53:23 +0000
Subject: [PATCH] - Update to 0.3.2:   * Fixed compatibility with pytest 4.2
 and later. [#38, #40] - Remove pytest42.patch merged upstream

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-remotedata?expand=0&rev=7
---
 pytest-remotedata-0.3.1.tar.gz   |  3 ---
 pytest-remotedata-0.3.2.tar.gz   |  3 +++
 pytest42.patch                   | 23 -----------------------
 python-pytest-remotedata.changes |  7 +++++++
 python-pytest-remotedata.spec    |  9 +++------
 5 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 pytest-remotedata-0.3.1.tar.gz
 create mode 100644 pytest-remotedata-0.3.2.tar.gz
 delete mode 100644 pytest42.patch

diff --git a/pytest-remotedata-0.3.1.tar.gz b/pytest-remotedata-0.3.1.tar.gz
deleted file mode 100644
index 31189ab..0000000
--- a/pytest-remotedata-0.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15b75a38431da96a4da5e48b20a18e4dcc40d191abc199b17cb969f818530481
-size 10367
diff --git a/pytest-remotedata-0.3.2.tar.gz b/pytest-remotedata-0.3.2.tar.gz
new file mode 100644
index 0000000..077d307
--- /dev/null
+++ b/pytest-remotedata-0.3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0
+size 11583
diff --git a/pytest42.patch b/pytest42.patch
deleted file mode 100644
index 6da2f82..0000000
--- a/pytest42.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b395fca12d392e433b19844d14d014a481ff52fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
-Date: Fri, 15 Feb 2019 10:26:59 +0100
-Subject: [PATCH] Use [tool:pytest] to fix build on pytest 4.2
-
-[pytest] marking is deprecated and errors out on 4.2+ version.
----
- tests/test_strict_check.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_strict_check.py b/tests/test_strict_check.py
-index 79b6073..8527c25 100644
---- a/tests/test_strict_check.py
-+++ b/tests/test_strict_check.py
-@@ -18,7 +18,7 @@ def test_internet_access():
- def _write_config_file(testdir, entry):
-     config = testdir.tmpdir.join('setup.cfg')
-     config.write("""
--[pytest]
-+[tool:pytest]
- {}
-         """.format(entry))
- 
diff --git a/python-pytest-remotedata.changes b/python-pytest-remotedata.changes
index 8de6b00..d3b7b4c 100644
--- a/python-pytest-remotedata.changes
+++ b/python-pytest-remotedata.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 22 08:52:02 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 0.3.2:
+  * Fixed compatibility with pytest 4.2 and later. [#38, #40]
+- Remove pytest42.patch merged upstream
+
 -------------------------------------------------------------------
 Fri Feb 15 09:20:39 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-pytest-remotedata.spec b/python-pytest-remotedata.spec
index 6fb4aa6..6b4b1b3 100644
--- a/python-pytest-remotedata.spec
+++ b/python-pytest-remotedata.spec
@@ -18,14 +18,13 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pytest-remotedata
-Version:        0.3.1
+Version:        0.3.2
 Release:        0
 Summary:        Pytest plugin for controlling remote data access
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/astropy/pytest-remotedata
+URL:            https://github.com/astropy/pytest-remotedata
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-remotedata/pytest-remotedata-%{version}.tar.gz
-Patch0:         pytest42.patch
 BuildRequires:  %{python_module pytest >= 3.1}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six}
@@ -34,7 +33,6 @@ BuildRequires:  python-rpm-macros
 Requires:       python-pytest >= 3.1
 Requires:       python-six
 BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -43,7 +41,6 @@ developers to control unit tests that require access to data from the internet.
 
 %prep
 %setup -q -n pytest-remotedata-%{version}
-%patch0 -p1
 
 %build
 %python_build
@@ -54,7 +51,7 @@ developers to control unit tests that require access to data from the internet.
 
 %check
 # test_internet_access (test_default_behavior, test_strict_with_decorator) - needs network
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not (test_default_behavior or test_strict_with_decorator)'
+%pytest -k 'not (test_default_behavior or test_strict_with_decorator)'
 
 %files %{python_files}
 %doc CHANGES.rst README.rst