From 7193280bfc5e23593c409c59963ee231843e9f6b6286aeb8f6f44aced3cb2b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jul 2020 06:31:50 +0000 Subject: [PATCH 1/5] Accepting request 820454 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/820454 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=153 --- Sphinx-3.0.4.tar.gz | 3 --- Sphinx-3.0.4.tar.gz.asc | 16 ---------------- Sphinx-3.1.2.tar.gz | 3 +++ Sphinx-3.1.2.tar.gz.asc | 16 ++++++++++++++++ python-Sphinx.changes | 4 ++-- python-Sphinx.spec | 4 +--- 6 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 Sphinx-3.0.4.tar.gz delete mode 100644 Sphinx-3.0.4.tar.gz.asc create mode 100644 Sphinx-3.1.2.tar.gz create mode 100644 Sphinx-3.1.2.tar.gz.asc diff --git a/Sphinx-3.0.4.tar.gz b/Sphinx-3.0.4.tar.gz deleted file mode 100644 index c68568e..0000000 --- a/Sphinx-3.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea64df287958ee5aac46be7ac2b7277305b0381d213728c3a49d8bb9b8415807 -size 5909229 diff --git a/Sphinx-3.0.4.tar.gz.asc b/Sphinx-3.0.4.tar.gz.asc deleted file mode 100644 index 9511563..0000000 --- a/Sphinx-3.0.4.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEihG3ml0NdJpm8KAwECwsF0mNa54FAl7NNzkACgkQECwsF0mN -a579pxAAjSOY7KtbxD/HR1bUqRdcTlnlN+OE1CjcPsvtOKDQQM4Tf/fgw0FCq6zO -X1rhPkkDkey2prOnioulxvbK6h+gYkOeFbESENwj2SkEUAdfhoee7M27jAOPRTzU -bAv3Q5eXLum2SkGBn7A5K+o764r77F3khTb4qdUs8E7JKWZd4vTgLQnrQdw65gxR -0Hm1Nvl2McpaGYxli+G8cwQZLON00uPYt+LdUHfDlHBBq/2NhRR4L0pCLB7+e+vo -OtdlXeElAk3BWMKOPzG49O6YpNhJDldN5GgyGknVAe9nIRataAJdK7OcJMOrUQzh -H4pB+4fSf6vXDtrkE4/pnpbMJl9emDjAMtr8Vn5P1DxkMmoyhtSXAKHU4C2JWeQB -XMHPlFzUPINRlZsbToLbneX2AXa8o56WbC6sZNV4jP9rAXMIJfEJ2DYXpOxfjA1G -ckvzD+7QkjN4P4DnKu0TxbPnc8K55xCvrDc1pdaJqCaMQv830BfPK9w1uN+SzmeW -eHcfeA2WO11bu5i/0kI3bn67HEWCSO5ZO1gjD6e2nqom1z6Odg5RYOCvc2jBid2T -AzMGtr9tCM8UvrYauW46uNy4wj39/0Cu8+8YLqp9ijn/Vw65tBRpZ50Jtla9bpi4 -p8lXdINsWzC3U9rJClaqRMn4u6SmaFq/T5AwoQWUPfJDmGuDFg8= -=HZrA ------END PGP SIGNATURE----- diff --git a/Sphinx-3.1.2.tar.gz b/Sphinx-3.1.2.tar.gz new file mode 100644 index 0000000..87f3a45 --- /dev/null +++ b/Sphinx-3.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9daeb9b39aa1ffefc2809b43604109825300300b987a24f45976c001ba1a8fd +size 5934433 diff --git a/Sphinx-3.1.2.tar.gz.asc b/Sphinx-3.1.2.tar.gz.asc new file mode 100644 index 0000000..30b314b --- /dev/null +++ b/Sphinx-3.1.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEihG3ml0NdJpm8KAwECwsF0mNa54FAl8BryEACgkQECwsF0mN +a54s0w//UBpPi7Uxtr7IiUpn46DqsKZT67M/WG1CrBauocTKabUGHLujqhyNw6F3 +cHA8kaHx5ROMWIkhNl/AkrwAZikHjRKwORQ+3wy8gqyl3LFoHJT6D1YaH6JJGR/Q +3b6+sPD1ZctC33tQCRnDMzbjMeXpzkVRjLNhnSIbYVtNVllcyIjf2ZUWxgzW8BVy +5AE9+kPSc3uQStKzWBfIXOLms/rDM89xipT8vvm6jg3Fh9jJfD8FZA+wAl3Kq6cm +zv7pwTGUPhJOXWntiN3YIYrp5uh8p9VBESYQNxFrk78jQIYbrO0N5GaW65c/BG7c +SLOtTMDX594iz283Sk8Ev1YXeRXu6pj95MmhTmU5N75Mk22c3yNmaLLHBelMIfyV +3NK/sGWb9JlSJo1eSOr0I3583Qke9cwE0Ghs1+QrFndroeChH9SCiJce5OQ0rRdx +vLTszgHBHSUQL2vQNw/P++CUYuem+/7KGGMdkXbwnz54vuIHwFluCy1OgZdQACRO +hTiM6W9WWl+zrCoFU8cso0uOSLLndbtCP60Lqj5kEoXFvbnBKVPZCJzDT3q7tj+4 +oy70tE6BBJVmz0MVICJAJUEid207lxHXa1Euh8+peenpmkqhL+KeDaqjxBdLwBEw +r4a2flXTWgmTYQIU5k6xlSdx9n8Gafs+zJk5LVwtBDUex4aZ06Q= +=x0eH +-----END PGP SIGNATURE----- diff --git a/python-Sphinx.changes b/python-Sphinx.changes index f123972..e8ff511 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2deafecca912b639ff6464d510e5f5e0a52ccb95d23597b83e899ce666e6eec -size 89612 +oid sha256:9bde8fe88c43d43fec4ec8dbf31a5164fb49d835fc0a564ee9aec5d6120f4488 +size 100425 diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 36ef37b..8796c4b 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -28,7 +28,7 @@ %endif %define skip_python2 1 Name: python-Sphinx%{psuffix} -Version: 3.0.4 +Version: 3.1.2 Release: 0 Summary: Python documentation generator License: BSD-2-Clause @@ -239,8 +239,6 @@ cp %{SOURCE2} doc/python3.inv %python_expand cp %{_defaultdocdir}/%{$python_prefix}/html/objects.inv doc/%{$python_prefix}.inv %endif %python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'%{$python_prefix}.inv'\2/g" doc/conf.py -# fix file not found error -sed -i -e 's/.. include:: ...CODE_OF_CONDUCT//g' doc/code_of_conduct.rst %python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_exec setup.py build_sphinx -b man From c71cc54a05693f204ca507936a96ff962e281f8ef56d71ad06a38a378d06a8b0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Jul 2020 12:53:58 +0000 Subject: [PATCH 2/5] - In the new multiversion world, python*.inv is in python3.8 directory not python3. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=154 --- python-Sphinx.changes | 4 ++-- python-Sphinx.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index e8ff511..548f640 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bde8fe88c43d43fec4ec8dbf31a5164fb49d835fc0a564ee9aec5d6120f4488 -size 100425 +oid sha256:fd562a2e9113a6fdc71fdbb54a1b2075fa2120d219e074aa47cb77ee78ea9f96 +size 100640 diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 8796c4b..f25a605 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -236,9 +236,9 @@ mkdir build.doc # so use a copy from version 3.8.2-3.1 from Tumbleweed cp %{SOURCE2} doc/python3.inv %else -%python_expand cp %{_defaultdocdir}/%{$python_prefix}/html/objects.inv doc/%{$python_prefix}.inv +%python_expand cp %{_defaultdocdir}/python%{$python_version}/html/objects.inv doc/python%{$python_version}.inv %endif -%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'%{$python_prefix}.inv'\2/g" doc/conf.py +%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'python%{$python_version}.inv'\2/g" doc/conf.py %python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_exec setup.py build_sphinx -b man From 7b215bb109dbe9b3c8f1c1f8fc3effb99b5f945449e75e20e6ee509c6ea0b04e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Jul 2020 12:58:08 +0000 Subject: [PATCH 3/5] Better version OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=155 --- python-Sphinx.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/python-Sphinx.spec b/python-Sphinx.spec index f25a605..5d8c3cb 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -227,6 +227,14 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en %if %{with test} mkdir build.doc +%{python_expand +%if "%{$python_prefix}" == "python%{$python_version}" +%define __pydocprefix python%{$python_version} +%else +%define __pydocprefix %{$python_prefix} +%endif +} + # get its intersphinx_inventroy from python3-doc # instead of via network from https://docs.python.org/3/objects.inv # https://github.com/sphinx-doc/sphinx/pull/7616 @@ -236,9 +244,9 @@ mkdir build.doc # so use a copy from version 3.8.2-3.1 from Tumbleweed cp %{SOURCE2} doc/python3.inv %else -%python_expand cp %{_defaultdocdir}/python%{$python_version}/html/objects.inv doc/python%{$python_version}.inv +%python_expand cp %{_defaultdocdir}/%{__pydocprefix}/html/objects.inv doc/python%{$python_version}.inv %endif -%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'python%{$python_version}.inv'\2/g" doc/conf.py +%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'%{__pydocprefix}.inv'\2/g" doc/conf.py %python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_exec setup.py build_sphinx -b man From cd9cbea3a6abc70a7df9f2c77bedbe6eb7bbf6140f14cebf8fe44ebb5290cfce Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Jul 2020 13:22:51 +0000 Subject: [PATCH 4/5] Too much work. Just use bundled python3.inv OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=156 --- python-Sphinx.spec | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 5d8c3cb..08fa943 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -227,26 +227,10 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en %if %{with test} mkdir build.doc -%{python_expand -%if "%{$python_prefix}" == "python%{$python_version}" -%define __pydocprefix python%{$python_version} -%else -%define __pydocprefix %{$python_prefix} -%endif -} - # get its intersphinx_inventroy from python3-doc # instead of via network from https://docs.python.org/3/objects.inv -# https://github.com/sphinx-doc/sphinx/pull/7616 -%if %{python3_version_nodots} <= 36 -# python3-doc 3.6.5-lp151.5.4 from Leap 15.1 -# doesn't have one necessary entry in python3.inv -# so use a copy from version 3.8.2-3.1 from Tumbleweed cp %{SOURCE2} doc/python3.inv -%else -%python_expand cp %{_defaultdocdir}/%{__pydocprefix}/html/objects.inv doc/python%{$python_version}.inv -%endif -%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'%{__pydocprefix}.inv'\2/g" doc/conf.py +%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'python%{$python_version}.inv'\2/g" doc/conf.py %python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_exec setup.py build_sphinx -b man From 4a61f9eb993590f8e590cb10afea9ab2ab44eae4e60a28ce13b16d2ee1d6eb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jul 2020 08:39:19 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=157 --- python-Sphinx.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 08fa943..98ea2d3 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -71,7 +71,6 @@ BuildArch: noarch BuildRequires: %{python_module Cython} BuildRequires: %{python_module Sphinx = %{version}} BuildRequires: %{python_module Sphinx-latex = %{version}} -BuildRequires: %{python_module doc} BuildRequires: %{python_module html5lib} BuildRequires: %{python_module mypy} BuildRequires: %{python_module pytest} @@ -230,7 +229,7 @@ mkdir build.doc # get its intersphinx_inventroy from python3-doc # instead of via network from https://docs.python.org/3/objects.inv cp %{SOURCE2} doc/python3.inv -%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'python%{$python_version}.inv'\2/g" doc/conf.py +%python_expand sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()}\)/\1'%{$python_prefix}.inv'\2/g" doc/conf.py %python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_exec setup.py build_sphinx -b man