Merge branch 'master' into epel8

.gitignore

@@ -16,3 +16,4 @@ simplejson-2.1.1.tar.gz
 /simplejson-3.5.3.tar.gz
 /simplejson-3.10.0.tar.gz
 /simplejson-3.16.0.tar.gz
+/simplejson-3.17.0.tar.gz

python-simplejson.spec

@@ -3,8 +3,7 @@
 %bcond_without tests
 
 Name:           python-simplejson
-
-Version:        3.16.0
+Version:        3.17.0
 Release:        2%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
@@ -14,39 +13,9 @@ License: (MIT or AFL) and (MIT or GPLv2)
 URL:            http://undefined.org/python/#simplejson
 Source0:        %pypi_source simplejson
 
-
 %description
 simplejson is a simple, fast, complete, correct and extensible JSON
-<http://json.org> encoder and decoder for Python 2.5+. It is pure Python code
-with no dependencies, but includes an optional C extension for a serious speed
-boost.
-
-The encoder may be subclassed to provide serialization in any kind of
-situation, without any special support by the objects to be serialized
-(somewhat like pickle).
-
-The decoder can handle incoming JSON strings of any specified encoding (UTF-8
-by default).
-
-simplejson is the externally maintained development version of the json library
-included with Python 2.6 and Python 3.0, but maintains backwards compatibility
-with Python 2.5.  It gets updated more regularly than the json module in the
-python stdlib.
-
-
-%package -n python2-simplejson
-Summary:        Simple, fast, extensible JSON encoder/decoder for Python2
-BuildRequires:  gcc
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%if %{with tests}
-BuildRequires:  python2-nose
-%endif
-%{?python_provide:%python_provide python2-simplejson}
-
-%description -n python2-simplejson
-simplejson is a simple, fast, complete, correct and extensible JSON
-<http://json.org> encoder and decoder for Python 2.5+. It is pure Python code
+<http://json.org> encoder and decoder for Python. It is pure Python code
 with no dependencies, but includes an optional C extension for a serious speed
 boost.
 
@@ -57,14 +26,13 @@ situation, without any special support by the objects to be serialized
 The decoder can handle incoming JSON strings of any specified encoding (UTF-8
 by default).
 
-simplejson is the externally maintained development version of the json library
-included with Python 2.6 and Python 3.0, but maintains backwards compatibility
-with Python 2.5.  It gets updated more regularly than the json module in the
-python stdlib.
-
+simplejson is the externally maintained development version of the JSON library
+included with Python. It gets updated more regularly than the JSON module in
+the Python stdlib.
 
 %package -n python%{python3_pkgversion}-simplejson
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python 3
+BuildRequires: gcc
 BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: python%{python3_pkgversion}-setuptools
 %if %{with tests}
@@ -77,9 +45,9 @@ BuildRequires: python%{python3_pkgversion}-sphinx
 
 %description -n python%{python3_pkgversion}-simplejson
 simplejson is a simple, fast, complete, correct and extensible JSON
-<http://json.org> encoder and decoder for Python 2.5+ and python3.3+ It is pure
-Python code with no dependencies, but includes an optional C extension for a
-serious speed boost.
+<http://json.org> encoder and decoder for Python. It is pure Python code
+with no dependencies, but includes an optional C extension for a serious speed
+boost.
 
 The encoder may be subclassed to provide serialization in any kind of
 situation, without any special support by the objects to be serialized
@@ -88,17 +56,14 @@ situation, without any special support by the objects to be serialized
 The decoder can handle incoming JSON strings of any specified encoding (UTF-8
 by default).
 
-simplejson is the externally maintained development version of the json library
-included with Python 2.6 and Python 3.0, but maintains backwards compatibility
-with Python 2.5.  It gets updated more regularly than the json module in the
-python stdlib.
-
+simplejson is the externally maintained development version of the JSON library
+included with Python. It gets updated more regularly than the JSON module in
+the Python stdlib.
 
 %prep
 %setup -q -n simplejson-%{version}
 
 %build
-%py2_build
 %py3_build
 
 %if %{with docs}
@@ -109,32 +74,40 @@ rm docs/.nojekyll
 %endif
 
 %install
-%py2_install
 %py3_install
 
 %if %{with tests}
 %check
-%{__python2} -m nose
 %{__python3} -m nose
 %endif
 
-%files -n python2-simplejson
-%license LICENSE.txt
-%if %{with docs}
-%doc docs
-%endif
-%{python2_sitearch}/simplejson/
-%{python2_sitearch}/simplejson-%{version}-py?.?.egg-info/
-
 %files -n python%{python3_pkgversion}-simplejson
 %license LICENSE.txt
 %if %{with docs}
 %doc docs
 %endif
 %{python3_sitearch}/simplejson/
-%{python3_sitearch}/simplejson-%{version}-py?.?.egg-info/
+%{python3_sitearch}/simplejson-%{version}-py*.egg-info/
 
 %changelog
+* Sun Jan 26 2020 Fabian Affolter <mail@fabian-affolter.ch> - 3.17.0-2
+- Tweak wildcard
+- Remove references to Python 2
+
+* Mon Nov 18 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.17.0-1
+- Update to 3.17.0 (#1773534).
+- https://github.com/simplejson/simplejson/blob/v3.17.0/CHANGES.txt
+- Drop python2-simplejson.
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.16.0-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.16.0-4
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (simplejson-3.16.0.tar.gz) = c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
+SHA512 (simplejson-3.17.0.tar.gz) = 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6