Notification time stamped 2023-06-30 14:20:35 UTC
From 991bafca79e3a6725142c89caf3541dda22bc828 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 20 2023 19:06:31 +0000
Subject: Run tests in parallel
Upstream explicitly supports this.
---
diff --git a/python-pyscaffold.spec b/python-pyscaffold.spec
index 602df24..0697942 100644
--- a/python-pyscaffold.spec
+++ b/python-pyscaffold.spec
@@ -179,7 +179,7 @@ k="${k-}${k+ and }not test_pipenv_works_with_pyscaffold"
# We should be able to write:
# %%tox -- -- -k "${k-}" …
# but for some reason this does not successfully collect any tests.
-%pytest -k "${k-}" \
+%pytest -k "${k-}" -n auto \
--ignore=tests/test_install.py \
--ignore=tests/system/test_common.py
%endif
https://src.fedoraproject.org/rpms/python-pyscaffold/c/991bafca79e3a6725142…
Notification time stamped 2023-06-30 14:20:35 UTC
From be34cee922c7e6203660734c9db8e55455751ef9 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 20 2023 18:45:18 +0000
Subject: Use new (rpm 4.17.1+) bcond style
---
diff --git a/python-pyscaffold.spec b/python-pyscaffold.spec
index e4d6266..45e8081 100644
--- a/python-pyscaffold.spec
+++ b/python-pyscaffold.spec
@@ -1,10 +1,10 @@
-%bcond_without tests
+%bcond tests 1
# Sphinx-generated HTML documentation is not suitable for packaging; see
# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion.
#
# We can generate PDF documentation as a substitute.
-%bcond_without doc_pdf
+%bcond doc_pdf 1
Name: python-pyscaffold
Version: 4.4.1
https://src.fedoraproject.org/rpms/python-pyscaffold/c/be34cee922c7e6203660…
Notification time stamped 2023-06-30 14:19:19 UTC
From 5d6e64441b3ad85a379319df1bb9cbe8d6c68c53 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 29 2023 19:01:46 +0000
Subject: Build docs as PDF instead of HTML
---
diff --git a/python-stdlib-list.spec b/python-stdlib-list.spec
index d29b41f..ca50be4 100644
--- a/python-stdlib-list.spec
+++ b/python-stdlib-list.spec
@@ -1,3 +1,9 @@
+# Sphinx-generated HTML documentation is not suitable for packaging; see
+# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion.
+#
+# We can generate PDF documentation as a substitute.
+%bcond doc_pdf 1
+
%global desc %{expand:
Python Standard Library List -This package includes lists of all of the
standard libraries for Python, along with the code for scraping the official
@@ -29,8 +35,13 @@ Summary: %{summary}
%package doc
Summary: Documentation for python-stdlib-list
+%if %{with doc_pdf}
+BuildRequires: make
+BuildRequires: python3-sphinx-latex
+BuildRequires: latexmk
# From requirements-dev.txt (which otherwise contains unwanted dependencies):
BuildRequires: %{py3_dist sphinx_rtd_theme}
+%endif
%description doc
%{summary}.
@@ -39,14 +50,15 @@ BuildRequires: %{py3_dist sphinx_rtd_theme}
%autosetup
%generate_buildrequires
-%pyproject_buildrequires -x develop
+%pyproject_buildrequires %{?with_doc_pdf:-x develop}
%build
%pyproject_wheel
-# generate html docs
-PYTHONPATH=${PWD} sphinx-build-3 docs html
-# remove the sphinx-build leftovers
-rm -rf html/.{doctrees,buildinfo}
+%if %{with doc_pdf}
+PYTHONPATH="${PWD}" %make_build -C docs latex \
+ SPHINXOPTS='-j%{?_smp_build_ncpus}'
+%make_build -C docs/_build/latex LATEXMKOPTS='-quiet'
+%endif
%install
%pyproject_install
@@ -67,11 +79,14 @@ rm -rf html/.{doctrees,buildinfo}
%files doc
%license LICENSE
-%doc html
+%if %{with doc_pdf}
+%doc docs/_build/latex/PythonStandardLibraryList.pdf
+%endif
%changelog
* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.8.0-9
- Port to pyproject-rpm-macros
+- Build docs as PDF instead of HTML
* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 0.8.0-8
- Rebuilt for Python 3.12
https://src.fedoraproject.org/rpms/python-stdlib-list/c/5d6e64441b3ad85a379…
Notification time stamped 2023-06-30 14:19:20 UTC
From ef069c18e283267107b36bd107a3772e92cd9d55 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 29 2023 19:26:05 +0000
Subject: Confirm License is SPDX MIT
---
diff --git a/python-stdlib-list.spec b/python-stdlib-list.spec
index 9429789..fa8a487 100644
--- a/python-stdlib-list.spec
+++ b/python-stdlib-list.spec
@@ -9,6 +9,7 @@ Version: 0.9.0
Release: 1%{?dist}
Summary: A list of Python Standard Libraries
+# SPDX
License: MIT
URL: https://github.com/pypi/stdlib-list
# pypi is missing docs, so use the github tarball instead
@@ -80,6 +81,7 @@ PYTHONPATH="${PWD}" %make_build -C docs latex \
%changelog
* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.9.0-1
- Update to 0.9.0 (fix RHBZ#2216610, fix RHBZ#2155214)
+- Confirm License is SPDX MIT
* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.8.0-9
- Port to pyproject-rpm-macros
https://src.fedoraproject.org/rpms/python-stdlib-list/c/ef069c18e283267107b…
Notification time stamped 2023-06-30 14:19:20 UTC
From 8817c4a46582d3055617198723b3a86281111f37 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 29 2023 19:04:05 +0000
Subject: Use a simplified description from upstream
---
diff --git a/python-stdlib-list.spec b/python-stdlib-list.spec
index ca50be4..674a4d2 100644
--- a/python-stdlib-list.spec
+++ b/python-stdlib-list.spec
@@ -4,13 +4,6 @@
# We can generate PDF documentation as a substitute.
%bcond doc_pdf 1
-%global desc %{expand:
-Python Standard Library List -This package includes lists of all of the
-standard libraries for Python, along with the code for scraping the official
-Python docs to get said lists.Listing the modules in the standard library?
-Wait, why on Earth would you care about that?! Because knowing whether or
-not a module is part of the standard library will come in}
-
Name: python-stdlib-list
Version: 0.8.0
Release: 9%{?dist}
@@ -25,6 +18,9 @@ BuildArch: noarch
BuildRequires: python3-devel
+%global desc %{expand:
+This package includes lists of all of the standard libraries for Python.}
+
%description %{desc}
%package -n python3-stdlib-list
@@ -87,6 +83,7 @@ PYTHONPATH="${PWD}" %make_build -C docs latex \
* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.8.0-9
- Port to pyproject-rpm-macros
- Build docs as PDF instead of HTML
+- Use a simplified description from upstream
* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 0.8.0-8
- Rebuilt for Python 3.12
https://src.fedoraproject.org/rpms/python-stdlib-list/c/8817c4a46582d305561…
Notification time stamped 2023-06-30 14:19:20 UTC
From ac8577e46abd3ff2852ca4659cabb8334ec5aa1e Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 29 2023 19:22:13 +0000
Subject: Update to 0.9.0 (fix RHBZ#2216610, fix RHBZ#2155214)
---
diff --git a/.gitignore b/.gitignore
index 6247999..ee272a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/stdlib-list-0.6.0.tar.gz
/python-stdlib-list-0.6.0.tar.gz
/python-stdlib-list-0.8.0.tar.gz
+/stdlib-list-0.9.0.tar.gz
diff --git a/python-stdlib-list.spec b/python-stdlib-list.spec
index 674a4d2..9429789 100644
--- a/python-stdlib-list.spec
+++ b/python-stdlib-list.spec
@@ -5,18 +5,22 @@
%bcond doc_pdf 1
Name: python-stdlib-list
-Version: 0.8.0
-Release: 9%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Summary: A list of Python Standard Libraries
License: MIT
-URL: https://github.com/jackmaney/python-stdlib-list
+URL: https://github.com/pypi/stdlib-list
# pypi is missing docs, so use the github tarball instead
-Source0: %{url}/archive/v%{version}.tar.gz#/python-stdlib-list-%{version}.tar.gz
+Source: %{url}/archive/v%{version}/stdlib-list-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python3-devel
+# We BR this manually since the other dependencies in the “test” extra are for
+# coverage analysis and are unwanted
+# (https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters).
+BuildRequires: %{py3_dist pytest}
%global desc %{expand:
This package includes lists of all of the standard libraries for Python.}
@@ -35,18 +39,18 @@ Summary: Documentation for python-stdlib-list
BuildRequires: make
BuildRequires: python3-sphinx-latex
BuildRequires: latexmk
-# From requirements-dev.txt (which otherwise contains unwanted dependencies):
-BuildRequires: %{py3_dist sphinx_rtd_theme}
%endif
%description doc
%{summary}.
%prep
-%autosetup
+%autosetup -n stdlib-list-%{version}
+# We don’t need the HTML theme to build PDF documentation:
+sed -r -i 's/, "furo"//' pyproject.toml
%generate_buildrequires
-%pyproject_buildrequires %{?with_doc_pdf:-x develop}
+%pyproject_buildrequires %{?with_doc_pdf:-x doc}
%build
%pyproject_wheel
@@ -61,16 +65,10 @@ PYTHONPATH="${PWD}" %make_build -C docs latex \
%pyproject_save_files stdlib_list
%check
-# Upstream has tests, but we cannot yet run them. Spend more time on it if it
-# is still a problem in 0.9.0.
-#
-# Similarly, investigate this if it persists, from stdlib_list.fetch:
-#
-# from . import base_dir, get_canonical_version, short_versions, list_dir
-# ImportError: cannot import name 'base_dir' from 'stdlib_list'
-%pyproject_check_import -e stdlib_list.fetch
+%pytest
%files -n python3-stdlib-list -f %{pyproject_files}
+%license LICENSE
%doc README.md
%files doc
@@ -80,6 +78,9 @@ PYTHONPATH="${PWD}" %make_build -C docs latex \
%endif
%changelog
+* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.9.0-1
+- Update to 0.9.0 (fix RHBZ#2216610, fix RHBZ#2155214)
+
* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.8.0-9
- Port to pyproject-rpm-macros
- Build docs as PDF instead of HTML
diff --git a/sources b/sources
index a97b9f5..8bf61c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-stdlib-list-0.8.0.tar.gz) = e18d893e257408125249064b9466e50f684a5358d0d8ab1693bf3529f23b47f82dc23b52cea6f8be89c7dc2bac58f8981ace0b7d7a016b295855562dba1aebc3
+SHA512 (stdlib-list-0.9.0.tar.gz) = bd0769f8196cc6eb5e524caa10af1d0aec2b85d4437404cfac8b52a8e97e6d0201b36d99e7ca21b86808b5cbe7c89ca1d4147ccb82497fe7cbfda1f166daa9f8
https://src.fedoraproject.org/rpms/python-stdlib-list/c/ac8577e46abd3ff2852…
Notification time stamped 2023-06-30 14:19:19 UTC
From a14a26b03454200a0a07d9168ad517c55c1a1c1a Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jun 29 2023 19:01:46 +0000
Subject: Port to pyproject-rpm-macros
---
diff --git a/python-stdlib-list.spec b/python-stdlib-list.spec
index 9244af9..d29b41f 100644
--- a/python-stdlib-list.spec
+++ b/python-stdlib-list.spec
@@ -1,76 +1,78 @@
-%global pypi_name stdlib-list
-
-%global desc %{expand: \
+%global desc %{expand:
Python Standard Library List -This package includes lists of all of the
standard libraries for Python, along with the code for scraping the official
Python docs to get said lists.Listing the modules in the standard library?
Wait, why on Earth would you care about that?! Because knowing whether or
not a module is part of the standard library will come in}
-Name: python-%{pypi_name}
+Name: python-stdlib-list
Version: 0.8.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A list of Python Standard Libraries
License: MIT
URL: https://github.com/jackmaney/python-stdlib-list
# pypi is missing docs, so use the github tarball instead
-Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildArch: noarch
+Source0: %{url}/archive/v%{version}.tar.gz#/python-stdlib-list-%{version}.tar.gz
-%{?python_enable_dependency_generator}
+BuildArch: noarch
BuildRequires: python3-devel
-BuildRequires: python3dist(setuptools)
-BuildRequires: python3dist(sphinx)
-BuildRequires: python3dist(sphinx-rtd-theme)
-%description
-%{desc}
+%description %{desc}
-%package -n python3-%{pypi_name}
+%package -n python3-stdlib-list
Summary: %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-# The require not picked up by the dep generator
-Requires: python3dist(sphinx)
-Requires: python3dist(sphinx-rtd-theme)
-
-%description -n python3-%{pypi_name}
-%{desc}
+%description -n python3-stdlib-list %{desc}
%package doc
-Summary: %{name} documentation
+Summary: Documentation for python-stdlib-list
+
+# From requirements-dev.txt (which otherwise contains unwanted dependencies):
+BuildRequires: %{py3_dist sphinx_rtd_theme}
%description doc
-Documentation for %{name}
+%{summary}.
%prep
%autosetup
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+
+%generate_buildrequires
+%pyproject_buildrequires -x develop
%build
-%py3_build
+%pyproject_wheel
# generate html docs
PYTHONPATH=${PWD} sphinx-build-3 docs html
# remove the sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}
%install
-%py3_install
-
-%files -n python3-%{pypi_name}
-%license LICENSE
+%pyproject_install
+%pyproject_save_files stdlib_list
+
+%check
+# Upstream has tests, but we cannot yet run them. Spend more time on it if it
+# is still a problem in 0.9.0.
+#
+# Similarly, investigate this if it persists, from stdlib_list.fetch:
+#
+# from . import base_dir, get_canonical_version, short_versions, list_dir
+# ImportError: cannot import name 'base_dir' from 'stdlib_list'
+%pyproject_check_import -e stdlib_list.fetch
+
+%files -n python3-stdlib-list -f %{pyproject_files}
%doc README.md
-%{python3_sitelib}/stdlib_list
-%{python3_sitelib}/stdlib_list-%{version}-py%{python3_version}.egg-info
%files doc
%license LICENSE
%doc html
%changelog
+* Thu Jun 29 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.8.0-9
+- Port to pyproject-rpm-macros
+
* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 0.8.0-8
- Rebuilt for Python 3.12
https://src.fedoraproject.org/rpms/python-stdlib-list/c/a14a26b03454200a0a0…