Add idna extras subpackage and switch to pyproject macros

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

.gitignore

@@ -2,3 +2,4 @@
 /service_identity-16.0.0.tar.gz
 /service-identity-16.0.0.tar.gz
 /service-identity-18.1.0.tar.gz
+/service-identity-21.1.0.tar.gz

0001-Revert-theme-change.patch

@@ -0,0 +1,56 @@
+From 18b24292779f8548198d3e4ada2e52d7669607e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Mon, 24 May 2021 13:58:40 +0200
+Subject: [PATCH] Revert theme change"
+
+---
+ docs/conf.py                     | 11 +++++++++--
+ setup.py                         |  2 +--
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 1517620..e9745c6 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -117,7 +117,7 @@ exclude_patterns = ["_build"]
+ # show_authors = False
+ 
+ # The name of the Pygments (syntax highlighting) style to use.
+-# pygments_style = "sphinx"
++pygments_style = "sphinx"
+ 
+ # A list of ignored prefixes for module index sorting.
+ # modindex_common_prefix = []
+@@ -131,7 +131,14 @@ exclude_patterns = ["_build"]
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+ 
+-html_theme = "furo"
++html_theme = "alabaster"
++html_theme_options = {
++    "font_family": '"Avenir Next", Calibri, "PT Sans", sans-serif',
++    "head_font_family": '"Avenir Next", Calibri, "PT Sans", sans-serif',
++    "font_size": "18px",
++    "page_width": "980px",
++    "show_relbars": True,
++}
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+diff --git a/setup.py b/setup.py
+index 921725a..29012ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -47,7 +46,7 @@ INSTALL_REQUIRES = [
+ EXTRAS_REQUIRE = {
+     "idna": ["idna"],
+     "tests": ["coverage[toml]>=5.0.2", "pytest"],
+-    "docs": ["sphinx", "furo"],
++    "docs": ["sphinx"],
+ }
+ EXTRAS_REQUIRE["dev"] = (
+     EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["docs"] + ["idna", "pyOpenSSL"]
+
+-- 
+2.31.1
+

python-service-identity.spec

@@ -1,147 +1,120 @@
-%bcond_with check
+%bcond_without check
 
 %global modname service-identity
-%global srcname service_identity
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
 
 Name:           python-%{modname}
-Version:        18.1.0
-Release:        2%{?dist}
+Version:        21.1.0
+Release:        5%{?dist}
 Summary:        Service identity verification for pyOpenSSL
 
 License:        MIT
-URL:            https://github.com/pyca/service_identity
+URL:            https://github.com/pyca/service-identity
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
+# Revert theme change as "furo" theme is not packaged
+Patch0:         0001-Revert-theme-change.patch
 
 BuildArch:      noarch
 
-%global _description \
-Service Identity Verification for pyOpenSSL.\
-\
-TL;DR: Use this package if you use pyOpenSSL and don’t want to be MITMed.\
-\
-service_identity aspires to give you all the tools you need for verifying\
-whether a certificate is valid for the intended purposes.\
-\
-In the simplest case, this means host name verification. However,\
-service_identity implements RFC 6125 fully and plans to add other\
-relevant RFCs too.
-
-%description %{_description}
-
-%package -n python2-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2dist(setuptools)
-%if %{with check}
-BuildRequires:  python2dist(attrs)
-BuildRequires:  python2dist(idna) >= 0.6
-BuildRequires:  python2dist(ipaddress)
-BuildRequires:  python2dist(pyasn1)
-BuildRequires:  python2dist(pyasn1-modules)
-BuildRequires:  python2dist(pyopenssl) >= 0.14
-BuildRequires:  python2dist(pytest)
-%endif
-Requires:       python2dist(attrs)
-Requires:       python2dist(pyasn1)
-Requires:       python2dist(pyasn1-modules)
-Requires:       python2dist(pyopenssl) >= 0.14
-Recommends:     python2dist(idna) >= 0.6
-
-%description -n python2-%{modname} %{_description}
+%global common_description %{expand:
+Use this package if you use pyOpenSSL and don’t want to be MITMed, or if you
+want to verify that a PyCA cryptography certificate is valid for a certain
+hostname or IP address.  service-identity aspires to give you all the tools you
+need for verifying whether a certificate is valid for the intended purposes.
+In the simplest case, this means host name verification.  However,
+service-identity implements RFC 6125 fully and plans to add other relevant RFCs
+too.}
 
-Python 2 version.
+%description %{common_description}
 
-%if %{with python3}
 %package -n python3-%{modname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{modname}}
 BuildRequires:  python3-devel
-BuildRequires:  python3dist(setuptools)
-BuildRequires:  python3dist(sphinx)
+BuildRequires:  %{py3_dist sphinx}
 %if %{with check}
-BuildRequires:  python3dist(attrs)
-BuildRequires:  python3dist(idna) >= 0.6
-BuildRequires:  python3dist(pyasn1)
-BuildRequires:  python3dist(pyasn1-modules)
-BuildRequires:  python3dist(pyopenssl) >= 0.14
-BuildRequires:  python3dist(pytest)
+BuildRequires:  %{py3_dist pytest}
 %endif
-Requires:       python3dist(attrs)
-Requires:       python3dist(pyasn1)
-Requires:       python3dist(pyasn1-modules)
-Requires:       python3dist(pyopenssl) >= 0.14
-Recommends:     python3dist(idna) >= 0.6
 
-%description -n python3-%{modname} %{_description}
-
-Python 3 version.
+%description -n python3-%{modname} %{common_description}
 
 %package -n python-%{modname}-doc
 Summary:        Service-identity documentation
 
 %description -n python-%{modname}-doc
 Documentation for service-identity.
-%endif
+
+%pyproject_extras_subpkg -n python3-%{modname} idna
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 
-%build
-%py2_build
-%if %{with python3}
-%py3_build
+%generate_buildrequires
+%if %{with check}
+%pyproject_buildrequires -x idna
 %endif
 
+%build
+%pyproject_wheel
+
 %install
-%py2_install
-%if %{with python3}
-%py3_install
-%endif
+%pyproject_install
+%pyproject_save_files service_identity
 
-%if %{with python3}
 # generate html docs
 PYTHONPATH=%{buildroot}%{python3_sitelib} sphinx-build-3 docs html
 # remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
-%endif
 
 %if %{with check}
 %check
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v
-%if %{with python3}
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
+%pytest -v
 %endif
-%endif
-
-%files -n python2-%{modname}
-%license LICENSE
-%doc README.rst
-%{python2_sitelib}/%{srcname}-*.egg-info/
-%{python2_sitelib}/%{srcname}/
 
-%if %{with python3}
-%files -n python3-%{modname}
-%license LICENSE
+%files -n python3-%{modname} -f %{pyproject_files}
 %doc README.rst
-%{python3_sitelib}/%{srcname}-*.egg-info/
-%{python3_sitelib}/%{srcname}/
 
 %files -n python-%{modname}-doc
 %doc html
 %license LICENSE docs/license.rst
-%endif
 
 %changelog
-* Mon Jul 22 2019 Stephen Smoogen <smooge@fedoraproject.org> - 18.1.0-2
-- Bootstrap for RHEL8
+* Fri Jan 28 2022 Carl George <carl@george.computer> - 21.1.0-5
+- Add idna extras subpackage
+- Switch to pyproject macros
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 21.1.0-2
+- Rebuilt for Python 3.10
+
+* Mon May 24 13:50:05 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-1
+- Update to 21.1.0
+- Close: rhbz#1958639
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 18.1.0-7
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Sep 09 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1.0-5
+- Subpackage python2-service-identity has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1.0-4
+- Rebuilt for Python 3.8
 
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Wed Jul 03 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1.0-2
 - Rebuilt to update automatic Python dependencies

sources

@@ -1 +1 @@
-SHA512 (service-identity-18.1.0.tar.gz) = 0d1abf6ba1e725e923171fd3b809b2cf7ba757ca47f773e8c99a2e2265425b253549609c76955c4d67fcd2fd305d479a1d7541cb26811e94db26ab853d3d3441
+SHA512 (service-identity-21.1.0.tar.gz) = 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461