diff --git a/.gitignore b/.gitignore index 54d40a6..cfe1c1c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /numpydoc-0.8.0.tar.gz /numpydoc-0.9.1.tar.gz /numpydoc-0.9.2.tar.gz +/numpydoc-1.1.0.tar.gz diff --git a/262.patch b/262.patch deleted file mode 100644 index 5dabb37..0000000 --- a/262.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2e4dd944d375cf771e95aef4fb34305ac6431632 Mon Sep 17 00:00:00 2001 -From: Eric Larson -Date: Thu, 7 May 2020 17:34:55 -0400 -Subject: [PATCH] FIX: Get doc of actual class - ---- - numpydoc/tests/test_docscrape.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/numpydoc/tests/test_docscrape.py b/numpydoc/tests/test_docscrape.py -index 94ad22a..1780ec4 100644 ---- a/numpydoc/tests/test_docscrape.py -+++ b/numpydoc/tests/test_docscrape.py -@@ -828,8 +828,7 @@ class Dummy(object): - """ - pass - -- obj = Dummy() -- s = str(FunctionDoc(obj, role='func')) -+ s = str(FunctionDoc(Dummy, role='func')) - assert(':func:`func_a`, :func:`func_b`' in s) - assert(' some relationship' in s) - assert(':func:`func_d`' in s) diff --git a/296.patch b/296.patch new file mode 100644 index 0000000..f9a6f40 --- /dev/null +++ b/296.patch @@ -0,0 +1,13 @@ +diff --git a/setup.cfg b/setup.cfg +index 420fc78..1e9d2d6 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,7 +1,7 @@ + [tool:pytest] + addopts = + --showlocals --doctest-modules -ra --cov-report= --cov=numpydoc +- --junit-xml=junit-results.xml --ignore=doc/conf.py ++ --junit-xml=junit-results.xml --ignore=doc/ + junit_family = xunit2 + filterwarnings = + ignore:'U' mode is deprecated:DeprecationWarning diff --git a/python-numpydoc.spec b/python-numpydoc.spec index c4a1dc6..4ea1655 100644 --- a/python-numpydoc.spec +++ b/python-numpydoc.spec @@ -1,21 +1,17 @@ Name: python-numpydoc -Version: 0.9.2 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Sphinx extension to support docstrings in NumPy format License: BSD URL: https://pypi.python.org/pypi/numpydoc Source0: https://files.pythonhosted.org/packages/source/n/numpydoc/numpydoc-%{version}.tar.gz -# Upstream patch for python 3.9 compatibility -Patch0: https://github.com/numpy/numpydoc/pull/262.patch +# Upstream patch to ignore doc/ directory during tests +Patch0: https://github.com/numpy/numpydoc/pull/296.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-nose -BuildRequires: python3-pytest -BuildRequires: python3-sphinx -BuildRequires: python3-matplotlib +BuildRequires: pyproject-rpm-macros %description Numpydoc inserts a hook into Sphinx's autodoc that converts docstrings @@ -25,8 +21,6 @@ following the NumPy/SciPy format to a form palatable to Sphinx. %package -n python3-numpydoc Summary: %{summary} %{?python_provide:%python_provide python3-numpydoc} -Requires: python3-sphinx >= 1.6.5 -Requires: python3-jinja2 >= 2.3 %description -n python3-numpydoc Numpydoc inserts a hook into Sphinx's autodoc that converts docstrings following the NumPy/SciPy format to a form palatable to Sphinx. @@ -35,25 +29,29 @@ following the NumPy/SciPy format to a form palatable to Sphinx. %prep %autosetup -p1 -n numpydoc-%{version} +%generate_buildrequires +%pyproject_buildrequires -x testing + %build -%py3_build +%pyproject_wheel %install -%py3_install - +%pyproject_install +%pyproject_save_files numpydoc %check -nosetests-3 -v +# Deselected tests need to download an inventory from docs.python.org +%pytest -k "not test_MyClass and not test_my_function" -%files -n python3-numpydoc +%files -n python3-numpydoc -f %pyproject_files %license LICENSE.txt %doc README.rst -%{python3_sitelib}/numpydoc -%{python3_sitelib}/numpydoc-%{version}-py%{python3_version}.egg-info - %changelog +* Wed Sep 09 2020 Lumír Balhar - 1.1.0-1 +- Update to 1.1.0 (#1701764) + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b4a2f12..a9721b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (numpydoc-0.9.2.tar.gz) = db8f5c3b409ece0a40f1c2ccb06eaa182896d173a5c913c7e6c5780fd021d746c48557fee6f050db8c42cfa41a5021901342bbb93dfd8b8daf7d43fead9cf94a +SHA512 (numpydoc-1.1.0.tar.gz) = 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106