rebuild for new libsodium

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -2,3 +2,7 @@
 /pynacl-1.1.1.tar.gz
 /pynacl-1.1.2.tar.gz
 /pynacl-1.2.0.tar.gz
+/pynacl-1.2.1.tar.gz
+/pynacl-1.3.0.tar.gz
+/pynacl-1.4.0.tar.gz
+/pynacl-1.5.0.tar.gz

python-pynacl.spec

@@ -3,104 +3,147 @@
 %global modname pynacl
 
 Name:           python-%{modname}
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        5%{?dist}
 Summary:        Python binding to the Networking and Cryptography (NaCl) library
 
 License:        ASL 2.0
 URL:            https://github.com/pyca/pynacl
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
 
+BuildRequires:  gcc
 BuildRequires:  libsodium-devel
 
-%global _description \
-PyNaCl is a Python binding to the Networking and Cryptography library,\
-a crypto library with the stated goal of improving usability, security\
-and speed.
+%global _description %{expand:
+PyNaCl is a Python binding to the Networking and Cryptography library,
+a crypto library with the stated goal of improving usability, security
+and speed.}
 
 %description %{_description}
 
-%package -n python2-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-cffi >= 1.4.1
-%if %{with check}
-BuildRequires:  python2-six
-BuildRequires:  python2-pytest >= 3.2.1
-BuildRequires:  python2-hypothesis >= 3.27.0
-%endif
-Requires:       python2-cffi >= 1.4.1
-Requires:       python2-six
-
-%description -n python2-%{modname} %{_description}
-
-Python 2 version.
-
 %package -n python3-%{modname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{modname}}
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-cffi >= 1.4.1
-%if %{with check}
-BuildRequires:  python3-six
-BuildRequires:  python3-pytest >= 3.2.1
-BuildRequires:  python3-hypothesis >= 3.27.0
-%endif
-Requires:       python3-cffi >= 1.4.1
-Requires:       python3-six
 
 %description -n python3-%{modname} %{_description}
 
 Python 3 version.
 
 %prep
-%autosetup -n %{modname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 # Remove bundled libsodium, to be sure
 rm -vrf src/libsodium/
 
+# ARM and s390x is too slow for upstream tests
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1594901
+# And https://github.com/pyca/pynacl/issues/370
+%ifarch s390x %{arm}
+sed -i 's/@settings(deadline=1500, max_examples=5)/@settings(deadline=4000, max_examples=5)/' tests/test_pwhash.py
+%endif
+
+%generate_buildrequires
+%pyproject_buildrequires %{?with_check:-x tests}
+
 %build
 export SODIUM_INSTALL=system
-%py2_build
-%py3_build
+%pyproject_wheel
 
 %install
-%py2_install
-%py3_install
+%pyproject_install
+%pyproject_save_files nacl
 
-%if %{with check}
 %check
-# ARM is too slow for upstream tests
-# https://github.com/pyca/pynacl/issues/370
-PYTHONPATH=%{buildroot}%{python2_sitearch} py.test-%{python2_version} -v \
-%ifarch %{arm}
-  || :
+%if %{with check}
+%pytest
 %else
-  ;
-%endif
-PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-%{python3_version} -v \
-%ifarch %{arm}
-  || :
-%else
-  ;
-%endif
+%pyproject_check_import
 %endif
 
-%files -n python2-%{modname}
-%license LICENSE
+%files -n python3-%{modname} -f %{pyproject_files}
 %doc README.rst
-%{python2_sitearch}/PyNaCl-*.egg-info/
-%{python2_sitearch}/nacl/
-
-%files -n python3-%{modname}
-%license LICENSE
-%doc README.rst
-%{python3_sitearch}/PyNaCl-*.egg-info/
-%{python3_sitearch}/nacl/
 
 %changelog
+* Thu Oct 05 2023 Remi Collet <remi@remirepo.net> - 1.5.0-5
+- rebuild for new libsodium
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.5.0-3
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Aug 31 2022 Major Hayden <major@mhtx.net> - 1.5.0-1
+- Update to 1.5.0 (#2038614)
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.4.0-7
+- Rebuilt for Python 3.11
+
+* Wed May 11 2022 Carl George <carl@george.computer> - 1.4.0-6
+- Convert to pyproject macros
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.4.0-3
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Aug 26 2020 Damien Ciabrini <dciabrin@redhat.com> - 1.4.0-1
+- Update to 1.4.0 (#1840424)
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-8
+- Rebuilt for Python 3.9
+
+* Mon May 11 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-7
+- Fix build with hypothesis 5 (#1830961)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Oct 13 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-5
+- Subpackage python2-pynacl has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 15 2019 Yatin Karel <ykarel@redhat.com> - 1.3.0-1
+- Update to 1.3.0
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-2
+- Rebuilt for Python 3.7
+- Prolong the deadline for tests on s390x
+- Don't ignore the test results on arm, do the same as on s390x
+
+* Tue Mar 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (pynacl-1.2.0.tar.gz) = ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1
+SHA512 (pynacl-1.5.0.tar.gz) = 905d3a7ce7f758b31a5d34471d5a0202fd2ba3d904a7ec59a158bcd1ea572fc87e29fc144c733d151cbaa48788c939808bc51d00acc973fe6d190eefdd3bfd59