From 0212213f2e4bbde34d27c6d6df7a0632f3b0f200 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sep 20 2019 14:10:28 +0000
Subject: Merge branch 'f31'


---

diff --git a/.gitignore b/.gitignore
index e1dcf04..79b15f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /GridDataFormats-0.3.2.tar.gz
 /GridDataFormats-0.3.3.tar.gz
 /GridDataFormats-0.4.0.tar.gz
+/GridDataFormats-0.5.0.tar.gz
diff --git a/python-GridDataFormats-float128.patch b/python-GridDataFormats-float128.patch
deleted file mode 100644
index a8dc3cb..0000000
--- a/python-GridDataFormats-float128.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up GridDataFormats-0.4.0/gridData/tests/test_dx.py.float128 GridDataFormats-0.4.0/gridData/tests/test_dx.py
---- GridDataFormats-0.4.0/gridData/tests/test_dx.py.float128	2018-01-12 21:49:01.000000000 +0100
-+++ GridDataFormats-0.4.0/gridData/tests/test_dx.py	2018-01-19 14:53:00.185104357 +0100
-@@ -85,5 +85,5 @@ def test_write_dx_byte(nptype="uint8", d
- 
- 
- @raises(ValueError)
--def test_write_dx_ValueError(nptype="float128", dxtype="unknown"):
-+def test_write_dx_ValueError(nptype="longdouble", dxtype="unknown"):
-     return _test_write_dx(nptype=nptype, dxtype=dxtype)
diff --git a/python-GridDataFormats.spec b/python-GridDataFormats.spec
index a5c9285..a141dc2 100644
--- a/python-GridDataFormats.spec
+++ b/python-GridDataFormats.spec
@@ -8,14 +8,12 @@ arrays. It supports reading from and writing to some common formats (such as \
 OpenDX).
 
 Name: python-%{pname}
-Version: 0.4.0
-Release: 7%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
 Summary: Read and write data on regular grids in Python
 License: LGPLv3+
 URL: https://github.com/orbeckst/GridDataFormats
 Source0: https://files.pythonhosted.org/packages/source/G/%{pname}/%{pname}-%{version}.tar.gz
-# https://github.com/MDAnalysis/GridDataFormats/pull/45
-Patch0: %{name}-float128.patch
 BuildArch: noarch
 
 %description
@@ -28,7 +26,9 @@ Recommends: python3-scipy
 BuildRequires: python3-devel
 BuildRequires: python3-numpy
 %if %{with check}
-BuildRequires: python3-nose
+BuildRequires: python3-pytest
+BuildRequires: python3-pytest-xdist
+BuildRequires: python3-scipy
 BuildRequires: python3-six
 BuildRequires: python3-tempdir
 %endif
@@ -39,7 +39,6 @@ BuildRequires: python3-tempdir
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1 -b .float128
 # force rebuild of Egg Metadata
 rm -r %{pname}.egg-info
 
@@ -51,16 +50,22 @@ rm -r %{pname}.egg-info
 
 %if %{with check}
 %check
-%{__python3} setup.py nosetests
+pytest-3 -v --numprocesses=auto ./gridData/tests
 %endif
 
 %files -n python3-%{pname}
 %license COPYING.LESSER
 %doc AUTHORS README.rst
-%{python3_sitelib}/%{pname}-%{version}-py3.?.egg-info
+%{python3_sitelib}/%{pname}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/gridData
 
 %changelog
+* Fri Sep 13 2019 Dominik Mierzejewski <dominik@greysector.net> 0.5.0-1
+- update to 0.5.0 (#1696989)
+- use pythonX_version macros
+- upstream switched to pytest for testing
+- run tests in parallel
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.0-7
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 7191605..d3e6a3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (GridDataFormats-0.4.0.tar.gz) = b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c
+SHA512 (GridDataFormats-0.5.0.tar.gz) = 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8