[packages/python3-jaraco.packaging] - updated to 9.4.0
qboosh
qboosh at pld-linux.org
Fri Oct 20 21:47:13 CEST 2023
commit 3e227eb5dfdcd9a9ec305f8d6946b80a436d98b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Oct 20 21:49:12 2023 +0200
- updated to 9.4.0
no-pep517.patch | 77 ++++++++++++++++++++++++++++++-------------
python3-jaraco.packaging.spec | 25 ++++++++------
2 files changed, 70 insertions(+), 32 deletions(-)
---
diff --git a/python3-jaraco.packaging.spec b/python3-jaraco.packaging.spec
index dd2b8df..b17dfd6 100644
--- a/python3-jaraco.packaging.spec
+++ b/python3-jaraco.packaging.spec
@@ -10,40 +10,45 @@
Summary: Tools to supplement packaging Python releases
Summary(pl.UTF-8): Narzędzia wspierające pakietowanie wydań modułów Pythona
Name: python3-%{pypi_name}
-Version: 9.0.0
-Release: 8
+Version: 9.4.0
+Release: 1
License: MIT
Group: Libraries/Python
#Source0Download: https://pypi.org/simple/jaraco-packaging/
Source0: https://files.pythonhosted.org/packages/source/j/jaraco.packaging/%{pypi_name}-%{version}.tar.gz
+# Source0-md5: 7b03f1b20477bdee86e0cc6e7b70cdca
Patch0: no-pep517.patch
-# Source0-md5: a97dd749afaff6844f0843e153a9e49d
URL: https://pypi.org/project/jaraco.packaging/
-BuildRequires: python3-modules >= 1:3.7
+BuildRequires: python3-modules >= 1:3.8
BuildRequires: python3-setuptools >= 1:31.0.1
BuildRequires: python3-setuptools_scm >= 3.4.1
BuildRequires: python3-toml
%if %{with tests}
+BuildRequires: python3-domdf-python-tools
%if "%{py3_ver}" < "3.8"
BuildRequires: python3-importlib_metadata
%endif
BuildRequires: python3-jaraco.test
BuildRequires: python3-pytest >= 6
BuildRequires: python3-pytest-black >= 0.3.7
+# lint only?
#BuildRequires: python3-pytest-checkdocs >= 2.4
BuildRequires: python3-pytest-cov
-#BuildRequires: python3-pytest-enabler >= 1.0.1
-BuildRequires: python3-pytest-flake8
-BuildRequires: python3-pytest-mypy >= 0.9.1
+#BuildRequires: python3-pytest-enabler >= 2.2
+#BuildRequires: python3-pytest-mypy >= 0.9.1
+#BuildRequires: python3-ruff
+#BuildRequires: python3-types-docutils
%endif
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.714
%if %{with doc}
+BuildRequires: python3-furo
BuildRequires: python3-rst.linker >= 1.9
-BuildRequires: sphinx-pdg-3
+#BuildRequires: python3-sphinx-lint
+BuildRequires: sphinx-pdg-3 >= 3.5
%endif
Requires: python3-jaraco
-Requires: python3-modules >= 1:3.7
+Requires: python3-modules >= 1:3.8
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -98,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES.rst LICENSE README.rst
+%doc LICENSE NEWS.rst README.rst
%{py3_sitescriptdir}/jaraco/packaging
%{py3_sitescriptdir}/%{egg_name}-%{version}-py*.egg-info
diff --git a/no-pep517.patch b/no-pep517.patch
index f035232..1b8565c 100644
--- a/no-pep517.patch
+++ b/no-pep517.patch
@@ -1,23 +1,57 @@
-This reverts https://github.com/jaraco/jaraco.packaging/commit/278f825bf6c9beba82aaa77d765dd8c86e342ca7
-which is plain stpuid from disto packaging perspective as it is trying to fetch packages from pip
+This reverts to the state before https://github.com/jaraco/jaraco.packaging/commit/278f825bf6c9beba82aaa77d765dd8c86e342ca7
+which was plain stupid from distro packaging perspective as it was trying to fetch packages from pip
at documentation build time.
-diff -ur jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py jaraco.packaging-9.0.0-no-pep517/jaraco/packaging/sphinx.py
---- jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py 2022-02-11 03:55:53.000000000 +0100
-+++ jaraco.packaging-9.0.0-no-pep517/jaraco/packaging/sphinx.py 2022-04-01 22:12:33.979598839 +0200
-@@ -1,6 +1,6 @@
+Current (9.4.0) code has some workaround, but it requires building wheel, which we don't do either.
+
+--- jaraco.packaging-9.4.0/jaraco/packaging/sphinx.py.orig 2023-10-17 20:57:31.545755310 +0200
++++ jaraco.packaging-9.4.0/jaraco/packaging/sphinx.py 2023-10-18 19:33:19.935053257 +0200
+@@ -7,11 +7,9 @@ True
+ """
+
import os
+-import warnings
+import sys
- import subprocess
--import pep517.meta
+ from importlib import metadata
+
+-from build.util import project_wheel_metadata as load_metadata
+-from jaraco.context import suppress
+ import sphinx.util.docutils
+ from docutils.parsers.rst import directives
+ import docutils.statemachine
+@@ -82,39 +80,25 @@ class SidebarLinksDirective(sphinx.util.
+ return [only_node]
- try:
- import importlib.metadata as imp_meta
-@@ -26,11 +26,19 @@
+
+- at suppress(KeyError)
+-def _load_metadata_from_wheel():
+- """
+- If indicated by an environment variable, expect the metadata
+- to be present in a wheel and load it from there, avoiding
+- the build process. Ref jaraco/jaraco.packaging#7.
+-
+- >>> _load_metadata_from_wheel()
+- >>> getfixture('static_wheel')
+- >>> meta = _load_metadata_from_wheel()
+- >>> meta['Name']
+- 'sampleproject'
+- """
+- wheel = os.environ['JARACO_PACKAGING_SPHINX_WHEEL']
+- warnings.warn(
+- "JARACO_PACKAGING_SPHINX_WHEEL is deprecated; fix pypa/build#556 instead",
+- DeprecationWarning,
+- )
+- (dist,) = metadata.distributions(path=[wheel])
+- return dist.metadata
+-
+-
+ def load_config_from_setup(app):
+ """
+ Replace values in app.config from package metadata
"""
# for now, assume project root is one level up
root = os.path.join(app.confdir, '..')
-- meta = pep517.meta.load(root).metadata
+- meta = _load_metadata_from_wheel() or load_metadata(root)
- app.config.project = meta['Name']
- app.config.version = app.config.release = meta['Version']
- app.config.package_url = meta['Home-page']
@@ -38,15 +72,14 @@ diff -ur jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py jaraco.packaging-9.0.
def configure_substitutions(app):
-diff -ur jaraco.packaging-9.0.0/setup.cfg jaraco.packaging-9.0.0-no-pep517/setup.cfg
---- jaraco.packaging-9.0.0/setup.cfg 2022-02-11 03:56:17.039524600 +0100
-+++ jaraco.packaging-9.0.0-no-pep517/setup.cfg 2022-04-01 22:12:33.979598839 +0200
-@@ -19,7 +19,6 @@
- python_requires = >=3.7
+--- jaraco.packaging-9.4.0/setup.cfg.orig 2023-10-17 20:57:31.549088625 +0200
++++ jaraco.packaging-9.4.0/setup.cfg 2023-10-18 19:36:51.620573125 +0200
+@@ -18,8 +18,6 @@ packages = find_namespace:
+ include_package_data = true
+ python_requires = >=3.8
install_requires =
- importlib_metadata; python_version < "3.8"
-- pep517
+- build[virtualenv]
+- jaraco.context
+ sphinx
+ domdf-python-tools
- [options.packages.find]
- exclude =
-Only in jaraco.packaging-9.0.0-no-pep517: setup.cfg.orig
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-jaraco.packaging.git/commitdiff/3e227eb5dfdcd9a9ec305f8d6946b80a436d98b2
More information about the pld-cvs-commit
mailing list