From f9ccabbd2c69daf9f42cbbf10668a3191d83069a Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sep 22 2019 23:43:46 +0000
Subject: Merge branch 'f31'


---

diff --git a/.gitignore b/.gitignore
index 45db330..a4418f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /gsd-v1.5.0.tar.gz
 /gsd-v1.5.1-html.zip
 /gsd-v1.5.1.tar.gz
+/gsd-1.9.0.tar.gz
+/gsd-v1.9.0-html.zip
diff --git a/python-gsd.spec b/python-gsd.spec
index cfdefdf..e696154 100644
--- a/python-gsd.spec
+++ b/python-gsd.spec
@@ -25,12 +25,12 @@ and writes hoomd schema gsd files with an easy to use syntax.\
 * Fast random access to frames.
 
 Name: python-gsd
-Version: 1.5.1
-Release: 7%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Summary: Read and write hoomd schema gsd files with an easy to use syntax 
 License: BSD
-URL: https://bitbucket.org/glotzer/gsd
-Source0: https://glotzerlab.engin.umich.edu/Downloads/%{pname}/%{pname}-v%{version}.tar.gz
+URL: https://gsd.readthedocs.io/
+Source0: https://github.com/glotzerlab/%{pname}/archive/v%{version}/%{pname}-%{version}.tar.gz
 Source1: https://readthedocs.org/projects/%{pname}/downloads/htmlzip/v%{version}/#/%{pname}-v%{version}-html.zip
 BuildRequires: gcc
 %if %{with docs}
@@ -55,7 +55,7 @@ BuildRequires: python3-Cython
 BuildRequires: python3-devel
 BuildRequires: python3-numpy
 %if %{with check}
-BuildRequires: python3-nose
+BuildRequires: python3-pytest
 %endif
 %{?python_provide:%python_provide python3-%{pname}}
 
@@ -63,7 +63,7 @@ BuildRequires: python3-nose
 %{desc}
 
 %prep
-%setup -q -n %{pname}-v%{version}
+%setup -q -n %{pname}-%{version}
 
 %build
 # rebuild C bindings with system Cython
@@ -86,8 +86,7 @@ mv %{pname}-v%{version}/_static/*  doc/_static/
 
 %if %{with check}
 %check
-# tests only work with python 3.2+ https://bitbucket.org/glotzer/gsd/issues/10/
-PYTHONPATH=%{buildroot}%{python3_sitearch} nosetests-%{python3_version}
+PYTHONPATH=%{buildroot}%{python3_sitearch} pytest-3 -v tests/
 %endif
 
 %files doc
@@ -96,11 +95,16 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} nosetests-%{python3_version}
 
 %files -n python3-%{pname}
 %license LICENSE
-%doc ChangeLog.md README.md
+%doc CHANGELOG.rst README.md
 %{python3_sitearch}/%{pname}-%{version}-py%{python3_version}.egg-info
 %{python3_sitearch}/%{pname}
 
 %changelog
+* Sun Sep 22 2019 Dominik Mierzejewski <dominik@greysector.net> 1.9.0-1
+- update to 1.9.0
+- point to new upstream URLs
+- switch test framework to pytest
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.1-7
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 43f68bb..7bd7354 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gsd-v1.5.1-html.zip) = cbb7cf9095d2c9782082177b2e35287783190f041001a6d2bbabecca801aa72ff3dc8e38162c4623106ed2cd551c38d3f7cb2da9e8a8fc46ead7b9dd38737ca7
-SHA512 (gsd-v1.5.1.tar.gz) = b4f7af2c6eb5ad9e8bc1aad56e939b8229c85b7ce3d2b8d576ef9a64d029c7bf9d508443edc03b61a5c0c9b28416b90eaf231f9058def06025ed5057c93024f0
+SHA512 (gsd-1.9.0.tar.gz) = fb4b9baaf12cd198ae588752aab1712766a63f6a5a6f3ed6e98db0e04db09554e6a6e1602fea0f60a296dd76f50aea7ee54efdcab4a3a525b7f797e359c4950c
+SHA512 (gsd-v1.9.0-html.zip) = e0f3a6c690b5ce17d98a573c02102ce5ea93c7f7f4028217a0dc8e65fe730064ff2b3a71a272695c05e7f359697a8b421ba975b3c89059ae21f3b3118eb9372a