Compare commits

..

1 Commits
epel8 ... i10ce

5
.gitignore vendored

@ -1,4 +1 @@
/service_identity-14.0.0.tar.gz
/service_identity-16.0.0.tar.gz
/service-identity-16.0.0.tar.gz
/service-identity-18.1.0.tar.gz
SOURCES/service_identity-24.2.0.tar.gz

@ -0,0 +1 @@
bf805eb2e4987b9a9ffd59f62094ec84b529dd84 SOURCES/service_identity-24.2.0.tar.gz

@ -0,0 +1,61 @@
From 5ab6102dbf6429fe63b2db6f0f6b43a125efe3b5 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
Date: Wed, 6 Nov 2024 18:30:12 -0600
Subject: [PATCH 1/2] Remove coverage[toml] test dependency
---
pyproject.toml | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index dabd973..a43705c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ dynamic = ["version", "readme"]
[project.optional-dependencies]
idna = ["idna"]
-tests = ["coverage[toml]>=5.0.2", "pytest"]
+tests = ["pytest"]
docs = ["sphinx", "furo", "myst-parser", "sphinx-notfound-page", "pyOpenSSL"]
mypy = ["mypy", "types-pyOpenSSL", "idna"]
dev = ["service-identity[tests,mypy,idna]", "pyOpenSSL"]
@@ -93,35 +93,6 @@ filterwarnings = ["once::Warning"]
norecursedirs = ["tests/typing"]
-[tool.coverage.run]
-parallel = true
-branch = true
-source = ["service_identity"]
-
-[tool.coverage.paths]
-source = ["src", ".tox/py*/**/site-packages"]
-
-[tool.coverage.report]
-show_missing = true
-skip_covered = true
-exclude_lines = [
- # a more strict default pragma
- "\\# pragma: no cover\\b",
-
- # allow defensive code
- "^\\s*raise AssertionError\\b",
- "^\\s*raise NotImplementedError\\b",
- "^\\s*return NotImplemented\\b",
- "^\\s*raise$",
-
- # typing-related code
- "^if (False|TYPE_CHECKING):",
- ": \\.\\.\\.(\\s*#.*)?$",
- "^ +\\.\\.\\.$",
- "-> ['\"]?NoReturn['\"]?:",
-]
-
-
[tool.interrogate]
omit-covered-files = true
verbose = 2
--
2.47.0

@ -0,0 +1,59 @@
From d8ef2148b09d6bfa5a6b9c5b025961ad40993e91 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
Date: Wed, 6 Nov 2024 18:27:44 -0600
Subject: [PATCH 2/2] Remove hatch-fancy-pypi-readme build-system dependency
---
pyproject.toml | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index a43705c..3d76d43 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"]
+requires = ["hatchling", "hatch-vcs"]
build-backend = "hatchling.build"
[project]
@@ -55,35 +55,6 @@ Twitter = "https://twitter.com/hynek"
source = "vcs"
raw-options = { local_scheme = "no-local-version" }
-[tool.hatch.metadata.hooks.fancy-pypi-readme]
-content-type = "text/markdown"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = "# Service Identity Verification for pyOpenSSL & *cryptography*\n"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.md"
-start-after = "spiel-begin -->\n"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-
-
-## Release Information
-
-"""
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "CHANGELOG.md"
-pattern = "\n(###.+?\n)## "
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-----
-
-[Complete Changelog →](https://service-identity.readthedocs.io/en/stable/changelog.html)
-"""
-
[tool.pytest.ini_options]
addopts = ["-ra", "--strict-markers", "--strict-config"]
--
2.47.0

@ -0,0 +1,258 @@
## START: Set by rpmautospec
## (rpmautospec version 0.7.3)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%bcond tests 1
%bcond docs %{undefined rhel}
Name: python-service-identity
Version: 24.2.0
Release: %autorelease
Summary: Service identity verification for pyOpenSSL & cryptography
License: MIT
URL: https://github.com/pyca/service-identity
Source: %{pypi_source service_identity}
# Downstream-only patch to remove coverage[toml] test dependency
Patch: 0001-Remove-coverage-toml-test-dependency.patch
# Downstream-only patch to remove hatch-fancy-pypi-readme build-system dependency
Patch: 0002-Remove-hatch-fancy-pypi-readme-build-system-dependency.patch
BuildArch: noarch
BuildRequires: python3-devel
%global common_description %{expand:
Use this package if you want to verify that a PyCA cryptography certificate is
valid for a certain hostname or IP address, or if you use pyOpenSSL and dont
want to be MITMed, or if you want to inspect certificates from either for
service IDs. 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.}
%description %{common_description}
%package -n python3-service-identity
Summary: %{summary}
%description -n python3-service-identity %{common_description}
%package doc
Summary: Documentation for %{name}
%description doc
%{common_description}
This is the documentation package for %{name}.
%pyproject_extras_subpkg -n python3-service-identity idna
%prep
%autosetup -p1 -n service_identity-%{version}
%generate_buildrequires
%pyproject_buildrequires %{?with_tests:-x tests,idna} %{?with_docs:-x docs}
%build
%pyproject_wheel
%install
%pyproject_install
%pyproject_save_files -l service_identity
%if %{with docs}
# Previously the docs were built with PYTHONPATH=%%{pyproject_build_lib}, but
# that macro is now deprecated. It also only works with setuptools, and
# upstream switched to hatchling. Building the docs relies on the library
# being installed, so we have to do it here in %%install instead of in %%build.
PYTHONPATH=%{buildroot}%{python3_sitelib} sphinx-build docs html
# remove the sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}
%endif
%check
%if %{with tests}
%pytest -v
%else
%pyproject_check_import
%endif
%files -n python3-service-identity -f %{pyproject_files}
%doc README.md
%if %{with docs}
%files doc
%doc html
%license LICENSE
%endif
%changelog
* Sat Jan 04 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 24.2.0-1
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Thu Nov 07 2024 Carl George <carlwgeorge@fedoraproject.org> - 24.2.0-1
- Update to version 24.2.0 rhbz#2258307
- Remove hatch-fancy-pypi-readme build-system dependency
- Disable docs when building for RHEL (EPEL)
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 23.1.0-6
- Rebuilt for Python 3.13
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 23.1.0-2
- Rebuilt for Python 3.12
* Thu Jun 15 2023 Carl George <carl@george.computer> - 23.1.0-1
- Update to version 23.1.0
* Thu Jun 15 2023 Carl George <carl@george.computer> - 21.1.0-15
- Remove unnecessary macros
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jun 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-12
- Fix the location of docs building
* Thu Jun 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-11
- Fix Python lib name
* Thu Jun 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-10
- Fix macro
* Thu Jun 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-9
- Fix typo
* Thu Jun 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-8
- Minor cosmetic fixes
* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 21.1.0-6
- Rebuilt for Python 3.11
* 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
* Wed Apr 10 18:38:06 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 18.1.0-1
- Release 18.1.0 (#1454995)
- Fix FTBFS with pytest 4.3 (#1693822)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 16.0.0-10
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 16.0.0-6
- Rebuild for Python 3.6
* Mon Dec 19 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 16.0.0-5
- Modernize spec
* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 16.0.0-4
- Enable tests
* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 16.0.0-3
- Rebuild for Python 3.6
- Disable python3 tests for now
* Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-2
- Use python3 to test python3 package.
- Fix dependencies.
* Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-1
- Update source URL for pypi migration. (#1361604)
- Build new version
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-5
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 14.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Jan 22 2015 robyduck@fedoraproject.org - 14.0.0-1
- Build new version
* Sat Jul 12 2014 tom.prince@twistedmatrix.com - 1.0.0-2
- Add python-idna dependency.
* Sat Jul 12 2014 tom.prince@twistedmatrix.com - 1.0.0-1
- Initial package.
## END: Generated by rpmautospec

@ -1,211 +0,0 @@
%bcond_with 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}
Summary: Service identity verification for pyOpenSSL
License: MIT
URL: https://github.com/pyca/service_identity
Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
BuildArch: noarch
%global _description \
Service Identity Verification for pyOpenSSL.\
\
TL;DR: Use this package if you use pyOpenSSL and dont 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}
Python 2 version.
%if %{with python3}
%package -n python3-%{modname}
Summary: %{summary}
%{?python_provide:%python_provide python3-%{modname}}
BuildRequires: python3-devel
BuildRequires: python3dist(setuptools)
BuildRequires: python3dist(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)
%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.
%package -n python-%{modname}-doc
Summary: Service-identity documentation
%description -n python-%{modname}-doc
Documentation for service-identity.
%endif
%prep
%autosetup -n %{srcname}-%{version}
%build
%py2_build
%if %{with python3}
%py3_build
%endif
%install
%py2_install
%if %{with python3}
%py3_install
%endif
%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
%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
%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
* Wed Jul 03 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1.0-2
- Rebuilt to update automatic Python dependencies
* Wed Apr 10 18:38:06 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 18.1.0-1
- Release 18.1.0 (#1454995)
- Fix FTBFS with pytest 4.3 (#1693822)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 16.0.0-10
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 16.0.0-6
- Rebuild for Python 3.6
* Mon Dec 19 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 16.0.0-5
- Modernize spec
* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 16.0.0-4
- Enable tests
* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 16.0.0-3
- Rebuild for Python 3.6
- Disable python3 tests for now
* Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-2
- Use python3 to test python3 package.
- Fix dependencies.
* Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-1
- Update source URL for pypi migration. (#1361604)
- Build new version
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-5
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 14.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Jan 22 2015 robyduck@fedoraproject.org - 14.0.0-1
- Build new version
* Sat Jul 12 2014 tom.prince@twistedmatrix.com - 1.0.0-2
- Add python-idna dependency.
* Sat Jul 12 2014 tom.prince@twistedmatrix.com - 1.0.0-1
- Initial package.

@ -1 +0,0 @@
SHA512 (service-identity-18.1.0.tar.gz) = 0d1abf6ba1e725e923171fd3b809b2cf7ba757ca47f773e8c99a2e2265425b253549609c76955c4d67fcd2fd305d479a1d7541cb26811e94db26ab853d3d3441
Loading…
Cancel
Save