#52 Avoid html5lib test dependency in RHEL builds
Merged a year ago by churchyard. Opened a year ago by yselkowitz.
rpms/ yselkowitz/python-sphinx rawhide  into  rawhide

file modified
+16 -1
@@ -28,7 +28,7 @@ 

  #global     prerel ...

  %global     upstream_version %{general_version}%{?prerel}

  Version:    %{general_version}%{?prerel:~%{prerel}}

- Release:    1%{?dist}

+ Release:    2%{?dist}

  Epoch:      1

  Summary:    Python documentation generator

  
@@ -248,6 +248,10 @@ 

  rm tests/roots/test-theming/{MANIFEST.in,setup.py}

  rm tests/test_setup_command.py

  

+ %if %{defined rhel}

+ # unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182

+ sed -i '/html5lib/d' pyproject.toml

+ %endif

  

  %generate_buildrequires

  %pyproject_buildrequires -r %{?with_tests:-x test}
@@ -327,7 +331,15 @@ 

  # Currently, all linkcheck tests and test_latex_images need internet

  # test_build_latex_doc needs internet to download pictures,

  # but fails also with it enabled, we decided to skip it entirely

+ # In RHEL builds, skip tests which use html5lib (excluded above)

  %pytest \

+ %if %{defined rhel}

+     --ignore tests/test_build_html.py \

+     --ignore tests/test_build_latex.py \

+     --ignore tests/test_build_texinfo.py \

+     --ignore tests/test_domain_std.py \

+     --ignore tests/test_smartquotes.py \

+ %endif

  %if %{without internet}

      -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \

  %endif
@@ -358,6 +370,9 @@ 

  

  

  %changelog

+ * Wed May 31 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:6.1.3-2

+ - Avoid html5lib test dependency in RHEL builds

+ 

  * Fri Mar 10 2023 Karolina Surma <ksurma@redhat.com> - 1:6.1.3-1

  - Update to 6.1.3

  - Fixes rhbz#2135122

One of my major faux pas is linking to private RHEL bugs in the Fedora content.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/75286a304991453d8c08f6cd1aaf249e

One of my major faux pas is linking to private RHEL bugs in the Fedora content.

I've just made that bugzilla public. No secrets were hidden there, except a bunch of links that lead to internal websites.

One of my major faux pas is linking to private RHEL bugs in the Fedora content.

Note that the comment was copied from c9s, which is also public.

Scratch build:

Building python-sphinx-6.1.3-1.eln126.src.rpm for eln-candidate
Created task: 101675533
Task info: https://koji.fedoraproject.org/koji/taskinfo?taskID=101675533

$ rpmdiff python-sphinx-6.1.3-1.fc39.src.rpm python-sphinx-6.1.3-1.eln126.src.rpm 
removed     REQUIRES ImageMagick  
removed     REQUIRES python3dist(html5lib)  
removed     PROVIDES python3-sphinx = 1:6.1.3-1.fc39
removed     PROVIDES python3-sphinx-latex = 1:6.1.3-1.fc39
removed     PROVIDES python-sphinx-doc = 1:6.1.3-1.fc39
added       PROVIDES python3-sphinx = 1:6.1.3-1.eln126
added       PROVIDES python3-sphinx-latex = 1:6.1.3-1.eln126
added       PROVIDES python-sphinx-doc = 1:6.1.3-1.eln126

$ rpmdiff python3-sphinx-6.1.3-1.fc39.noarch.rpm python3-sphinx-6.1.3-1.eln126.noarch.rpm 
removed     PROVIDES python-sphinx = 1:6.1.3-1.fc39
removed     PROVIDES python3-sphinx = 1:6.1.3-1.fc39
removed     PROVIDES python3.11-sphinx = 1:6.1.3-1.fc39
added       PROVIDES python-sphinx = 1:6.1.3-1.eln126
added       PROVIDES python3-sphinx = 1:6.1.3-1.eln126
added       PROVIDES python3.11-sphinx = 1:6.1.3-1.eln126
added       OBSOLETES python3.11-sphinx < 1:6.1.3-1.eln126
S.5........ /usr/lib/python3.11/site-packages/sphinx-6.1.3.dist-info/METADATA

$ rpm2cpio python3-sphinx-6.1.3-1.fc39.noarch.rpm | cpio -idm && mv usr usr.fedora
$ rpm2cpio python3-sphinx-6.1.3-1.eln126.noarch.rpm | cpio -idm && mv usr usr.eln

$ diff -u usr.{fedora,eln}/lib/python3.11/site-packages/sphinx-6.1.3.dist-info/METADATA
--- usr.fedora/lib/python3.11/site-packages/sphinx-6.1.3.dist-info/METADATA 2023-03-10 01:00:00.000000000 +0100
+++ usr.eln/lib/python3.11/site-packages/sphinx-6.1.3.dist-info/METADATA    2023-03-10 01:00:00.000000000 +0100
@@ -68,7 +68,6 @@
 Requires-Dist: docutils-stubs ; extra == "lint"
 Requires-Dist: types-requests ; extra == "lint"
 Requires-Dist: pytest>=4.6 ; extra == "test"
-Requires-Dist: html5lib ; extra == "test"
 Requires-Dist: cython ; extra == "test"
 Project-URL: Changelog, https://www.sphinx-doc.org/en/master/changes.html
 Project-URL: Code, https://github.com/sphinx-doc/sphinx

@yselkowitz python-sphinx-1:6.1.3-1.eln126 has already been built, do you not need to bump the release?

rebased onto 5311862

a year ago

Pull-Request has been merged by churchyard

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/7a3528318d824477b7a0ae54617d12a8

Metadata