[packages/python3-jaraco.packaging] - revert pep517 stupidity, rel 4

baggins baggins at pld-linux.org
Fri Apr 1 22:15:07 CEST 2022


commit c00082132cbde656080bb9254467aa9be77be5ba
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 1 22:14:49 2022 +0200

    - revert pep517 stupidity, rel 4

 no-pep517.patch               | 52 +++++++++++++++++++++++++++++++++++++++++++
 python3-jaraco.packaging.spec |  5 +++--
 2 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/python3-jaraco.packaging.spec b/python3-jaraco.packaging.spec
index ffcc006..367340e 100644
--- a/python3-jaraco.packaging.spec
+++ b/python3-jaraco.packaging.spec
@@ -11,11 +11,12 @@ 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:	3
+Release:	4
 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
+Patch0:		no-pep517.patch
 # Source0-md5:	a97dd749afaff6844f0843e153a9e49d
 URL:		https://pypi.org/project/jaraco.packaging/
 BuildRequires:	python3-modules >= 1:3.7
@@ -27,7 +28,6 @@ BuildRequires:	python3-toml
 BuildRequires:	python3-importlib_metadata
 %endif
 BuildRequires:	python3-jaraco.test
-BuildRequires:	python3-pep517
 BuildRequires:	python3-pytest >= 6
 BuildRequires:	python3-pytest-black >= 0.3.7
 #BuildRequires:	python3-pytest-checkdocs >= 2.4
@@ -66,6 +66,7 @@ Dokumentacja API modułu Pythona jaraco.packaging.
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
+%patch0 -p1
 
 # stub for setuptools
 cat >setup.py <<EOF
diff --git a/no-pep517.patch b/no-pep517.patch
new file mode 100644
index 0000000..f035232
--- /dev/null
+++ b/no-pep517.patch
@@ -0,0 +1,52 @@
+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
+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 @@
+ import os
++import sys
+ import subprocess
+-import pep517.meta
+ 
+ try:
+     import importlib.metadata as imp_meta
+@@ -26,11 +26,19 @@
+     """
+     # for now, assume project root is one level up
+     root = os.path.join(app.confdir, '..')
+-    meta = pep517.meta.load(root).metadata
+-    app.config.project = meta['Name']
+-    app.config.version = app.config.release = meta['Version']
+-    app.config.package_url = meta['Home-page']
+-    app.config.author = app.config.copyright = meta['Author']
++    setup_script = os.path.join(root, 'setup.py')
++    fields = ['--name', '--version', '--url', '--author']
++    dist_info_cmd = [sys.executable, setup_script] + fields
++    output = subprocess.check_output(dist_info_cmd, cwd=root, universal_newlines=True)
++    outputs = output.strip().split('\n')
++    try:
++        project, version, url, author = outputs
++    except ValueError:
++        raise ValueError("Unexpected metadata output", output)
++    app.config.project = project
++    app.config.version = app.config.release = version
++    app.config.package_url = url
++    app.config.author = app.config.copyright = author
+ 
+ 
+ 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
+ install_requires = 
+ 	importlib_metadata; python_version < "3.8"
+-	pep517
+ 
+ [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/c00082132cbde656080bb9254467aa9be77be5ba



More information about the pld-cvs-commit mailing list