#5 Update to 1.1.9 and modernize packaging
Merged 7 months ago by ksurma. Opened 9 months ago by ksurma.
rpms/ ksurma/python-sphinxcontrib-serializinghtml 1.1.9  into  rawhide

file modified
+1
@@ -1,1 +1,2 @@ 

  /sphinxcontrib-serializinghtml-*.tar.gz

+ /sphinxcontrib_serializinghtml-*.tar.gz

@@ -0,0 +1,32 @@ 

+ From e680b4403819e0afbf5bef6a95227899cade6ae9 Mon Sep 17 00:00:00 2001

+ From: Karolina Surma <ksurma@redhat.com>

+ Date: Fri, 20 Oct 2023 14:03:31 +0200

+ Subject: [PATCH] Prevent circular dependency with Sphinx

+ 

+ ---

+  pyproject.toml | 4 +---

+  1 file changed, 1 insertion(+), 3 deletions(-)

+ 

+ diff --git a/pyproject.toml b/pyproject.toml

+ index a8cbb00..6518bb6 100644

+ --- a/pyproject.toml

+ +++ b/pyproject.toml

+ @@ -39,14 +39,12 @@ classifiers = [

+      "Topic :: Text Processing",

+      "Topic :: Utilities",

+  ]

+ -dependencies = [

+ -    "Sphinx>=5",

+ -]

+  dynamic = ["version"]

+  

+  [project.optional-dependencies]

+  test = [

+      "pytest",

+ +    "Sphinx",

+  ]

+  lint = [

+      "flake8",

+ -- 

+ 2.41.0

+ 

@@ -1,42 +1,44 @@ 

- %global pypi_name sphinxcontrib-serializinghtml

- 

  # when bootstrapping sphinx, we cannot run tests yet

  %bcond_without check

  

- Name:           python-%{pypi_name}

- Version:        1.1.5

- Release:        11%{?dist}

+ Name:           python-sphinxcontrib-serializinghtml

+ Version:        1.1.9

+ Release:        1%{?dist}

  Summary:        Sphinx extension for serialized HTML

  License:        BSD-2-Clause

  URL:            http://sphinx-doc.org/

- Source0:        %{pypi_source}

+ Source:         %{pypi_source sphinxcontrib_serializinghtml}

  BuildArch:      noarch

  

+ # Sphinx requires sphinxcontrib-* packages, they've started requiring Sphinx

+ # In the RPM environment the dependencies are handled correctly without it

+ # Remove the runtime requirement on Sphinx from this package

+ # See: https://github.com/sphinx-doc/sphinx/issues/11567

+ Patch:          Prevent-circular-dependency-with-Sphinx.patch

+ 

  BuildRequires:  gettext

  BuildRequires:  python%{python3_pkgversion}-devel

- BuildRequires:  python%{python3_pkgversion}-setuptools

  

- %if %{with check}

- BuildRequires:  python%{python3_pkgversion}-pytest

- BuildRequires:  python%{python3_pkgversion}-sphinx >= 1:2

- %endif

  

  %description

  sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"

  HTML files (json and pickle).

  

  

- %package -n     python%{python3_pkgversion}-%{pypi_name}

+ %package -n     python%{python3_pkgversion}-sphinxcontrib-serializinghtml

  Summary:        %{summary}

- %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}

  

- %description -n python%{python3_pkgversion}-%{pypi_name}

+ %description -n python%{python3_pkgversion}-sphinxcontrib-serializinghtml

  sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"

  HTML files (json and pickle).

  

  

+ %generate_buildrequires

+ %pyproject_buildrequires %{?with_check: -x test}

+ 

+ 

  %prep

- %autosetup -n %{pypi_name}-%{version}

+ %autosetup -n sphinxcontrib_serializinghtml-%{version}

  find -name '*.mo' -delete

  

  
@@ -44,11 +46,11 @@ 

  for po in $(find -name '*.po'); do

    msgfmt --output-file=${po%.po}.mo ${po}

  done

- %py3_build

+ %pyproject_wheel

  

  

  %install

- %py3_install

+ %pyproject_install

  

  # Move language files to /usr/share

  pushd %{buildroot}%{python3_sitelib}
@@ -72,15 +74,18 @@ 

  %endif

  

  

- %files -n python%{python3_pkgversion}-%{pypi_name} -f sphinxcontrib.serializinghtml.lang

+ %files -n python%{python3_pkgversion}-sphinxcontrib-serializinghtml -f sphinxcontrib.serializinghtml.lang

  %license LICENSE

  %doc README.rst

  %{python3_sitelib}/sphinxcontrib/

- %{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}-*.pth

- %{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}.egg-info/

+ %{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}.dist-info/

  

  

  %changelog

+ * Thu Aug 24 2023 Karolina Surma <ksurma@redhat.com> - 1.1.9-1

+ - Update to 1.1.9

+ Resolves: rhbz#2230148

+ 

  * Thu Aug 10 2023 Karolina Surma <ksurma@redhat.com> - 1.1.5-11

  - Declare the license as an SPDX expression

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667

+ SHA512 (sphinxcontrib_serializinghtml-1.1.9.tar.gz) = 9e14527794a71120c1db9dc534383f3e56ee18241009aab2a04133351fc4dd56ee9ba242ad64be13faf44162e90e88109eb36a5692fb343f4bb28f43cda78bba

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

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/3b68d66995ca4a53b209efa44c4e9a22

rebased onto fdd8118

7 months ago

Rebased with a patch removing the dependency on Sphinx created by upstream.

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/cbe6206b1c3d46c99b20d4545f7942df

rebased onto 52f8a1a

7 months ago

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

Pull-Request has been merged by ksurma

7 months ago