public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-sphinxcontrib-programoutput] rawhide: Version 0.20
@ 2026-06-29  8:05 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-06-29  8:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-sphinxcontrib-programoutput
            Branch : rawhide
            Commit : 804ba8fdd1c6c18fc4480ed526ead37c2bf5c199
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
            Date   : 2026-06-29T10:05:10+02:00
            Stats  : +21/-25 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-sphinxcontrib-programoutput/c/804ba8fdd1c6c18fc4480ed526ead37c2bf5c199?branch=rawhide

            Log:
            Version 0.20

... (rhbz#2441593)
- Switch to %pyproject macros (rhbz#2378233)

---
diff --git a/.gitignore b/.gitignore
index 735a1a2..fef538e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /sphinxcontrib-programoutput-0.16.tar.gz
 /sphinxcontrib-programoutput-0.17.tar.gz
 /sphinxcontrib-programoutput-0.18.tar.gz
+/sphinxcontrib-programoutput-0.20.tar.gz

diff --git a/python-sphinxcontrib-programoutput.spec b/python-sphinxcontrib-programoutput.spec
index 80876bb..bdc63f8 100644
--- a/python-sphinxcontrib-programoutput.spec
+++ b/python-sphinxcontrib-programoutput.spec
@@ -1,9 +1,7 @@
-%{?python_enable_dependency_generator}
 %global srcname sphinxcontrib-programoutput
-%global _docdir_fmt %{name}
 
 Name:           python-sphinxcontrib-programoutput
-Version:        0.18
+Version:        0.20
 Release:        %autorelease
 Summary:        Extension to insert output of commands into documents
 
@@ -12,17 +10,15 @@ URL:            https://pypi.python.org/pypi/sphinxcontrib-programoutput
 Source0:        https://github.com/NextThought/sphinxcontrib-programoutput/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python3-sphinx
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  python3dist(sphinx) >= 1.3.5
 BuildRequires:  python3-furo
 # The documentation runs commands like 'python -V' and 'python --help'.
 # Any python version is fine.
 BuildRequires:  python-unversioned-command
 BuildRequires:  pytest
-BuildRequires:  git
+BuildRequires:  git-core
 BuildRequires:  web-assets-devel
 
 %description
@@ -32,9 +28,7 @@ up to date.
 
 %package -n python3-%{srcname}
 Summary:       %{summary}
-
 Requires:       js-jquery
-%{?python_provide:%python_provide python3-%{srcname}}
 
 %description -n python3-%{srcname}
 A Sphinx extension to literally insert the output of arbitrary
@@ -43,43 +37,44 @@ up to date.
 
 %prep
 %autosetup -n %{srcname}-%{version} -p1
-sed -r -i s/python/python3/ src/sphinxcontrib/programoutput/tests/{test_directive.py,test_command.py,test_cache.py}
+# sed -r -i s/python/python3/ src/sphinxcontrib/programoutput/tests/{test_directive.py,test_command.py,test_cache.py}
 
 %build
-%py3_build
-rm build/lib/sphinxcontrib/__init__.py
+%pyproject_wheel
+# rm build/lib/sphinxcontrib/__init__.py
 
 # workaround https://github.com/python/cpython/issues/94741
-echo 'import importlib; importlib.invalidate_caches(); del importlib' > build/lib/sitecustomize.py
+echo 'import importlib; importlib.invalidate_caches(); del importlib' >build/lib/sitecustomize.py
 PYTHONPATH=build/lib sphinx-build -b html docs build/html
 rm build/lib/sitecustomize.py build/lib/__pycache__/sitecustomize.*.pyc
 
 rm -r build/html/.buildinfo build/html/.doctrees
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files -L sphinxcontrib
+
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -rv build/html %{buildroot}%{_pkgdocdir}/
-ln -vsf %{_jsdir}/jquery/latest/jquery.min.js %{buildroot}%{_pkgdocdir}/html/_static/jquery.js
+ln -vsf --relative %{_jsdir}/jquery/latest/jquery.min.js %{buildroot}%{_pkgdocdir}/html/_static/jquery.js
 
 %check
 OPTIONS=(
-  # Those two fail because of some warnign:
-  # > assert 'Unexpected return code 1 from command' in excinfo.exception.args[0]
-  # E assert 'Unexpected return code 1 from command' in "directive 'deprecated' is already registered, it will be overridden"
-  # I'm not sure what exactly generates this warning. But it doesn't seem to be
-  # an actual problem with the code, so let's ignore this for now.
-  -k 'not (test_shell_with_unexpected_return_code or test_unexpected_return_code)'
+    # Those two fail because of some warning:
+    # > assert 'Unexpected return code 1 from command' in excinfo.exception.args[0]
+    # E assert 'Unexpected return code 1 from command' in "directive 'deprecated' is already registered, it will be overridden"
+    # I'm not sure what exactly generates this warning. But it doesn't seem to be
+    # an actual problem with the code, so let's ignore this for now.
+    #
+    # erbsland.sphinx.ansi extension is not packaged
+    -k 'not (test_shell_with_unexpected_return_code or test_unexpected_return_code or test_use_ansi_enabled_extension)'
 )
 
 %pytest -v %{buildroot}%{python3_sitelib}/sphinxcontrib "${OPTIONS[@]}"
 
-
-%files -n python3-%{srcname}
+%files -n python3-%{srcname} -f %{pyproject_files}
 %license LICENSE
 %doc %{_pkgdocdir}
-%{python3_sitelib}/sphinxcontrib/*
-%{python3_sitelib}/sphinxcontrib_programoutput*info/
 
 %changelog
 %autochangelog

diff --git a/sources b/sources
index 52c61fe..c644aa5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sphinxcontrib-programoutput-0.18.tar.gz) = a4d5d146c8f83b4f72c4359b8980866134720288f13d4fe6f029b8fddac1d05c9f9fe777d0bef1aa0bebc17b540b2e19bef21ddc3e08af373d204fe8b50ec904
+SHA512 (sphinxcontrib-programoutput-0.20.tar.gz) = 4e265a3cd88e63dba3735fb2146c17118d12bfd951bcd4d06844e0b29a21e0dd96e1342b8ff7275a20da45f4dbabe8e7112b223c5e7a8e2a9a975de7d5d3c9c3

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-29  8:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29  8:05 [rpms/python-sphinxcontrib-programoutput] rawhide: Version 0.20 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox