Control: tags -1 +patch
Attached is a patch that fixes this FTBFS; the offending import is no longer
needed and so just deleting the line is enough to solve the bug. (This is
fixed in a similar fashion upstream along with a few other changes to
numpydoc.)
cheers
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
From 4f08d02c13dc4aa98e31f2e9ba58bc065712da45 Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Thu, 3 May 2018 23:09:56 +1000
Subject: [PATCH 2/2] Remove unneeded import from numpydoc to fix FTBFS
(Closes: #896633)
---
debian/changelog | 1 +
debian/patches/numpydoc-directive.patch | 10 ++++++++++
debian/patches/series | 1 +
3 files changed, 12 insertions(+)
create mode 100644 debian/patches/numpydoc-directive.patch
diff --git a/debian/changelog b/debian/changelog
index 891b035..9a08cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ python-numpy (1:1.13.3-3) UNRELEASED; urgency=medium
[ Stuart Prescott ]
* add debhelper sequence to support --with numpy,numpy3
+ * Remove unneeded import in numpydoc, fixing FTBFS (Closes: #896633)
-- Ondřej Nový <on...@debian.org> Tue, 13 Feb 2018 10:05:23 +0100
diff --git a/debian/patches/numpydoc-directive.patch b/debian/patches/numpydoc-directive.patch
new file mode 100644
index 0000000..72eb865
--- /dev/null
+++ b/debian/patches/numpydoc-directive.patch
@@ -0,0 +1,10 @@
+--- a/doc/sphinxext/numpydoc/numpydoc.py
++++ b/doc/sphinxext/numpydoc/numpydoc.py
+@@ -29,7 +29,6 @@
+ raise RuntimeError("Sphinx 1.0.1 or newer is required")
+
+ from .docscrape_sphinx import get_doc_object, SphinxDocString
+-from sphinx.util.compat import Directive
+
+ if sys.version_info[0] >= 3:
+ sixu = lambda s: s
diff --git a/debian/patches/series b/debian/patches/series
index 3e2b507..fa55b09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+numpydoc-directive.patch
03_force_f2py_version.patch
10_use_local_python.org_object.inv_sphinx.diff
python3-soabi.patch
--
2.11.0
