1
0

Accepting request 1006630 from devel:languages:python

- Add patch remove-sphinx-testing.patch, to remove the sphinx-testing
  dependency, based on gh#mrsenko/sphinx-removed-in#9

OBS-URL: https://build.opensuse.org/request/show/1006630
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sphinx-removed-in?expand=0&rev=3
This commit is contained in:
Richard Brown 2022-09-29 16:12:28 +00:00 committed by Git OBS Bridge
commit 3cef0298b3
3 changed files with 79 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 28 10:48:00 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
- Add patch remove-sphinx-testing.patch, to remove the sphinx-testing
dependency, based on gh#mrsenko/sphinx-removed-in#9
-------------------------------------------------------------------
Fri Mar 6 13:24:35 UTC 2020 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-sphinx-removed-in
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,10 +25,12 @@ License: BSD-3-Clause
Group: Development/Languages/Python
URL: https://github.com/MrSenko/sphinx-removed-in
Source: https://github.com/MrSenko/sphinx-removed-in/archive/v%{version}.tar.gz
# PATCH-FIX-UPSTREAM remove-sphinx-testing.patch -- based on PR
# gh#mrsenko/sphinx-removed-in#9
Patch0: remove-sphinx-testing.patch
BuildRequires: %{python_module Sphinx}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module sphinx-testing}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Sphinx
@ -39,7 +41,7 @@ BuildArch: noarch
Sphinx Removed In Extension
%prep
%setup -q -n sphinx-removed-in-%{version}
%autosetup -p1 -n sphinx-removed-in-%{version}
%build
%python_build

View File

@ -0,0 +1,68 @@
Index: sphinx-removed-in-0.2.1/Makefile
===================================================================
--- sphinx-removed-in-0.2.1.orig/Makefile
+++ sphinx-removed-in-0.2.1/Makefile
@@ -1,6 +1,6 @@
test:
flake8 setup.py sphinx_removed_in tests
- python -m unittest discover -v
+ python -m pytest -v
build: test
./setup.py sdist
Index: sphinx-removed-in-0.2.1/tests/requirements.txt
===================================================================
--- sphinx-removed-in-0.2.1.orig/tests/requirements.txt
+++ sphinx-removed-in-0.2.1/tests/requirements.txt
@@ -1,4 +1,4 @@
Sphinx
flake8
coverage
-sphinx-testing
+pytest
Index: sphinx-removed-in-0.2.1/tests/test_extension.py
===================================================================
--- sphinx-removed-in-0.2.1.orig/tests/test_extension.py
+++ sphinx-removed-in-0.2.1/tests/test_extension.py
@@ -1,22 +1,21 @@
import os
import sys
-import unittest
-from sphinx_testing import with_app
+import pytest
-sys.path.insert(0,
- os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
+PARENT = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')
+sys.path.insert(0, PARENT)
-class TestExtension(unittest.TestCase):
- @with_app(buildername='html', srcdir='./docs', copy_srcdir_to_tmpdir=True)
- def test_sphinx_build(self, app, status, warning):
- app.build()
+@pytest.mark.sphinx(buildername='html', srcdir=os.path.join(PARENT, 'docs'))
+def test_sphinx_build(app, status, warning):
+ app.build()
+ try:
html = (app.outdir / 'index.html').read_text()
+ except AttributeError:
+ # an older version of sphinx (used e.g. on Python 2)
+ # use the now deprecated API instead
+ html = (app.outdir / 'index.html').text()
- self.assertIn('Removed in version 1.2', html)
- self.assertIn('Removed in version 3.2', html)
-
-
-if __name__ == "__main__":
- unittest.main()
+ assert 'Removed in version 1.2' in html
+ assert 'Removed in version 3.2' in html
Index: sphinx-removed-in-0.2.1/tests/conftest.py
===================================================================
--- /dev/null
+++ sphinx-removed-in-0.2.1/tests/conftest.py
@@ -0,0 +1 @@
+pytest_plugins = 'sphinx.testing.fixtures'