From 84390f06eed0c2ec2c7bfa8c8a0bcf94c78843dd3fec30601fb79719bdd54596 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 2 May 2023 10:35:37 +0000 Subject: [PATCH] Accepting request 1083998 from home:bnavigator:branches:devel:languages:python - Replace unsupported setuptoos sphinx_build hook - Remove six and setuptools from requirements metadata OBS-URL: https://build.opensuse.org/request/show/1083998 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-manuel?expand=0&rev=25 --- conf.py | 15 --------------- python-manuel-no-six.patch | 15 +++++++++++++++ python-manuel.changes | 6 ++++++ python-manuel.spec | 9 +++------ 4 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 conf.py diff --git a/conf.py b/conf.py deleted file mode 100644 index bfb6e0e..0000000 --- a/conf.py +++ /dev/null @@ -1,15 +0,0 @@ -source_suffix = '.txt' -master_doc = 'src/manuel/index' -project = 'Manuel' -copyright = 'Benji York' -version = '1' -release = '1' -today_fmt = '%Y-%m-%d' -pygments_style = 'sphinx' - -html_last_updated_fmt = '%Y-%m-%d' -html_title = 'Manuel Documentation' - -todo_include_todos = False -exclude_patterns = ['src/manuel.egg-info*'] -unused_docs = ['src/manuel/capture'] diff --git a/python-manuel-no-six.patch b/python-manuel-no-six.patch index 3549c47..725e80e 100644 --- a/python-manuel-no-six.patch +++ b/python-manuel-no-six.patch @@ -18,3 +18,18 @@ Index: manuel-1.12.4/src/manuel/doctest.py pass +Index: manuel-1.12.4/setup.py +=================================================================== +--- manuel-1.12.4.orig/setup.py ++++ manuel-1.12.4/setup.py +@@ -48,10 +48,6 @@ setup( + }, + tests_require=tests_require, + test_suite='manuel.tests.test_suite', +- install_requires=[ +- 'setuptools', +- 'six', +- ], + include_package_data=True, + long_description=long_description, + keywords=['testing', 'documentation'], diff --git a/python-manuel.changes b/python-manuel.changes index 35c86e5..1f62c0b 100644 --- a/python-manuel.changes +++ b/python-manuel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 2 10:14:39 UTC 2023 - Ben Greiner + +- Replace unsupported setuptoos sphinx_build hook +- Remove six and setuptools from requirements metadata + ------------------------------------------------------------------- Tue Jan 3 18:56:12 UTC 2023 - Ben Greiner diff --git a/python-manuel.spec b/python-manuel.spec index 4fe1315..5e5f800 100644 --- a/python-manuel.spec +++ b/python-manuel.spec @@ -25,8 +25,6 @@ License: Apache-2.0 URL: https://pypi.org/project/manuel/ # SourceRepository: https://github.com/benji-york/manuel Source: https://files.pythonhosted.org/packages/source/m/manuel/manuel-%{version}.tar.gz -# add fixed sphinx config -Source1: conf.py # https://github.com/benji-york/manuel/issues/33 Patch0: python-manuel-no-six.patch BuildRequires: %{python_module pip} @@ -38,6 +36,8 @@ BuildRequires: python-rpm-macros BuildArch: noarch # SECTION Documentation requirements: BuildRequires: python3-Sphinx +BuildRequires: python3-myst-parser +BuildRequires: python3-sphinxcontrib-copybutton # /SECTION # SECTION Testing requirements: BuildRequires: %{python_module zope.testing} @@ -58,13 +58,10 @@ This package contains documentation files for %{name}. %prep %autosetup -p1 -n manuel-%{version} -cp %{SOURCE1} . %build %pyproject_wheel -# build docs only one time -python3 setup.py build_sphinx -mv build/sphinx/html docs +sphinx-build -c sphinx/ -a src/manuel docs/ rm docs/.buildinfo %install