[Python-modules-commits] [dask.distributed] 05/07: Use Debian doc packages for intersphinx objects.inv files
Diane Trout
diane at moszumanska.debian.org
Fri Dec 8 16:26:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
diane pushed a commit to branch master
in repository dask.distributed.
commit ae786df0319b9e658436350611750130e45b28f2
Author: Diane Trout <diane at ghic.org>
Date: Fri Dec 8 08:23:08 2017 -0800
Use Debian doc packages for intersphinx objects.inv files
---
debian/changelog | 1 +
debian/control | 2 +
debian/numpy-objects.inv | 180 -----------------
.../patches/use-local-intersphinx-inventory.patch | 4 +-
debian/python-objects.inv | 217 ---------------------
debian/rules | 5 -
6 files changed, 5 insertions(+), 404 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3831e73..1cc272d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dask.distributed (1.19.2+ds.1-1) unstable; urgency=medium
* New upstream release.
* Add sphinx-rtd-theme-common dependency to
python-distributed-doc. (Closes: #872224)
+ * Use Debian doc packages for intersphinx objects.inv files.
-- Diane Trout <diane at ghic.org> Thu, 12 Oct 2017 20:56:29 -0700
diff --git a/debian/control b/debian/control
index 6733382..9d386b6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,10 @@ Build-Depends: coffeescript,
python3-click (>= 6.6),
python3-cloudpickle,
python3-dask (>= 0.14.0),
+ python3-doc <!nodoc>,
python3-locket,
python3-msgpack,
+ python-numpy-doc <!nodoc>,
python3-numpydoc,
python3-psutil,
python3-setuptools,
diff --git a/debian/numpy-objects.inv b/debian/numpy-objects.inv
deleted file mode 100644
index 8b904eb..0000000
--- a/debian/numpy-objects.inv
+++ /dev/null
@@ -1,180 +0,0 @@
-None<!DOCTYPE html>
-
-<html>
- <head>
- <meta charset="utf-8">
-
- <title>Overview — NumPy v1.13 Manual</title>
-
- <link rel="stylesheet" type="text/css" href="_static/css/spc-bootstrap.css">
- <link rel="stylesheet" type="text/css" href="_static/css/spc-extend.css">
- <link rel="stylesheet" href="_static/scipy.css" type="text/css" >
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" >
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: './',
- VERSION: '1.13.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: false
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <script type="text/javascript" src="_static/js/copybutton.js"></script>
- <link rel="author" title="About these documents" href="about.html" >
- <link rel="index" title="Index" href="genindex.html" >
- <link rel="search" title="Search" href="search.html" >
- <link rel="top" title="NumPy v1.13 Manual" href="#" >
- </head>
- <body>
-
-<div class="container">
- <div class="top-scipy-org-logo-header">
- <a href="#">
- <img style="border: 0;" alt="SciPy" src="_static/img/scipy_org_logo.gif"></a>
- </div>
- </div>
-</div>
-
-
- <div class="container">
- <div class="main">
-
- <div class="row-fluid">
- <div class="span12">
- <div class="spc-navbar">
-
- <ul class="nav nav-pills pull-left">
- <li class="active"><a href="http://scipy.org/">Scipy.org</a></li>
- <li class="active"><a href="http://docs.scipy.org/">Docs</a></li>
-
-
- </ul>
-
-
- <ul class="nav nav-pills pull-right">
- <li class="active">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a>
- </li>
- </ul>
-
- </div>
- </div>
- </div>
-
-
- <div class="row-fluid">
- <div class="span9">
-
- <div class="bodywrapper">
- <div class="body" id="spc-section-body">
-
- <h1>NumPy v1.13 Manual</h1>
- <p>
- Welcome! This is
- the documentation for NumPy
- 1.13.0, last updated Jun 10, 2017.
- </p>
-
- <p><strong>Parts of the documentation:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="user/index.html">NumPy User Guide</a><br/>
- <span class="linkdescr">start here</span></p>
- <p class="biglink"><a class="biglink" href="reference/index.html">NumPy Reference</a><br/>
- <span class="linkdescr">reference documentation</span></p>
- <p class="biglink"><a class="biglink" href="f2py/index.html">F2Py Guide</a><br/>
- <span class="linkdescr">f2py documentation</span></p>
- <p class="biglink"><a class="biglink" href="dev/index.html">NumPy Developer Guide</a><br/>
- <span class="linkdescr">contributing to NumPy</span></p>
- </td></tr>
- </table>
-
- <p><strong>Indices and tables:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="genindex.html">General Index</a><br/>
- <span class="linkdescr">all functions, classes, terms</span></p>
- <p class="biglink"><a class="biglink" href="glossary.html">Glossary</a><br/>
- <span class="linkdescr">the most important terms explained</span></p>
- </td><td width="50%">
- <p class="biglink"><a class="biglink" href="search.html">Search page</a><br/>
- <span class="linkdescr">search this documentation</span></p>
- <p class="biglink"><a class="biglink" href="contents.html">Complete Table of Contents</a><br/>
- <span class="linkdescr">lists all sections and subsections</span></p>
- </td></tr>
- </table>
-
- <p><strong>Meta information:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="bugs.html">Reporting bugs</a></p>
- <p class="biglink"><a class="biglink" href="about.html">About NumPy</a></p>
- <p class="biglink"><a class="biglink" href="neps/index.html">NumPy Enhancement Proposals</a><br/>
- </td><td width="50%">
- <p class="biglink"><a class="biglink" href="release.html">Release Notes</a></p>
- <p class="biglink"><a class="biglink" href="license.html">License of NumPy</a></p>
- </td></tr>
- </table>
-
- <h2>Acknowledgements</h2>
- <p>
- Large parts of this manual originate from Travis E. Oliphant's book
- <a href="http://www.tramy.us/">"Guide to NumPy"</a> (which generously entered
- Public Domain in August 2008). The reference documentation for many of
- the functions are written by numerous contributors and developers of
- NumPy, both prior to and during the
- <a href="http://docs.scipy.org/numpy/">NumPy Documentation Marathon</a>.
- </p>
- <p>
- The preferred way to update the documentation is by submitting a pull
- request on Github (see the
- <a href="http://docs.scipy.org/doc/numpy-dev/dev/">Developer Guide</a>.
- The <a href="http://docs.scipy.org/numpy/">NumPy Documentation Wiki</a>
- can also still be used to submit documentation fixes.
- Please help us to further improve the NumPy documentation!
- </p>
-
-
- </div>
- </div>
- </div>
- <div class="spc-rightsidebar span3">
- <div class="sphinxsidebarwrapper">
-
-
-
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="container container-navbar-bottom">
- <div class="spc-navbar">
-
- </div>
- </div>
- <div class="container">
- <div class="footer">
- <div class="row-fluid">
- <ul class="inline pull-left">
- <li>
- © Copyright 2008-2009, The Scipy community.
- </li>
- <li>
- Last updated on Jun 10, 2017.
- </li>
- <li>
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.5.3.
- </li>
- </ul>
- </div>
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
diff --git a/debian/patches/use-local-intersphinx-inventory.patch b/debian/patches/use-local-intersphinx-inventory.patch
index 695c995..7c964e8 100644
--- a/debian/patches/use-local-intersphinx-inventory.patch
+++ b/debian/patches/use-local-intersphinx-inventory.patch
@@ -6,6 +6,6 @@
intersphinx_mapping = {
- 'python': ('https://docs.python.org/3', None),
- 'numpy': ('http://docs.scipy.org/doc/numpy', None),
-+ 'python': ('https://docs.python.org/3', '../../debian/python-objects.inv'),
-+ 'numpy': ('http://docs.scipy.org/doc/numpy', '../../debian/numpy-objects.inv'),
++ 'python': ('https://docs.python.org/3', '/usr/share/doc/python3/html/objects.inv'),
++ 'numpy': ('http://docs.scipy.org/doc/numpy', '/usr/share/doc/numpy/html/objects.inv'),
}
diff --git a/debian/python-objects.inv b/debian/python-objects.inv
deleted file mode 100644
index d48ae6b..0000000
--- a/debian/python-objects.inv
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>3.6.2 Documentation</title>
-
- <link rel="stylesheet" href="_static/pydoctheme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: './',
- VERSION: '3.6.2',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <script type="text/javascript" src="_static/sidebar.js"></script>
- <link rel="search" type="application/opensearchdescription+xml"
- title="Search within Python 3.6.2 documentation"
- href="_static/opensearch.xml"/>
- <link rel="author" title="About these documents" href="about.html" />
- <link rel="copyright" title="Copyright" href="copyright.html" />
- <link rel="top" title="Python 3.6.2 documentation" href="contents.html" />
- <link rel="shortcut icon" type="image/png" href="_static/py.png" />
- <link rel="canonical" href="https://docs.python.org/3/index.html" />
-
- <script type="text/javascript" src="_static/copybutton.js"></script>
- <script type="text/javascript" src="_static/version_switch.js"></script>
-
-
-
-
- </head>
- <body role="document">
- <div class="related" role="navigation" aria-label="related navigation">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="py-modindex.html" title="Python Module Index"
- >modules</a> |</li>
- <li><img src="_static/py.png" alt=""
- style="vertical-align: middle; margin-top: -1px"/></li>
- <li><a href="https://www.python.org/">Python</a> »</li>
- <li>
- <span class="version_switcher_placeholder">3.6.2</span>
- <a href="#">Documentation </a> »
- </li>
-
- <li class="right">
-
-
- <div class="inline-search" style="display: none" role="search">
- <form class="inline-search" action="search.html" method="get">
- <input placeholder="Quick search" type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- </div>
- <script type="text/javascript">$('.inline-search').show(0);</script>
- |
- </li>
-
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body" role="main">
-
- <h1>Python 3.6.2 documentation</h1>
- <p>
- Welcome! This is the documentation for Python 3.6.2.
- </p>
- <p><strong>Parts of the documentation:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="whatsnew/3.6.html">What's new in Python 3.6?</a><br/>
- <span class="linkdescr"> or <a href="whatsnew/index.html">all "What's new" documents</a> since 2.0</span></p>
- <p class="biglink"><a class="biglink" href="tutorial/index.html">Tutorial</a><br/>
- <span class="linkdescr">start here</span></p>
- <p class="biglink"><a class="biglink" href="library/index.html">Library Reference</a><br/>
- <span class="linkdescr">keep this under your pillow</span></p>
- <p class="biglink"><a class="biglink" href="reference/index.html">Language Reference</a><br/>
- <span class="linkdescr">describes syntax and language elements</span></p>
- <p class="biglink"><a class="biglink" href="using/index.html">Python Setup and Usage</a><br/>
- <span class="linkdescr">how to use Python on different platforms</span></p>
- <p class="biglink"><a class="biglink" href="howto/index.html">Python HOWTOs</a><br/>
- <span class="linkdescr">in-depth documents on specific topics</span></p>
- </td><td width="50%">
- <p class="biglink"><a class="biglink" href="installing/index.html">Installing Python Modules</a><br/>
- <span class="linkdescr">installing from the Python Package Index & other sources</span></p>
- <p class="biglink"><a class="biglink" href="distributing/index.html">Distributing Python Modules</a><br/>
- <span class="linkdescr">publishing modules for installation by others</span></p>
- <p class="biglink"><a class="biglink" href="extending/index.html">Extending and Embedding</a><br/>
- <span class="linkdescr">tutorial for C/C++ programmers</span></p>
- <p class="biglink"><a class="biglink" href="c-api/index.html">Python/C API</a><br/>
- <span class="linkdescr">reference for C/C++ programmers</span></p>
- <p class="biglink"><a class="biglink" href="faq/index.html">FAQs</a><br/>
- <span class="linkdescr">frequently asked questions (with answers!)</span></p>
- </td></tr>
- </table>
-
- <p><strong>Indices and tables:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="py-modindex.html">Global Module Index</a><br/>
- <span class="linkdescr">quick access to all modules</span></p>
- <p class="biglink"><a class="biglink" href="genindex.html">General Index</a><br/>
- <span class="linkdescr">all functions, classes, terms</span></p>
- <p class="biglink"><a class="biglink" href="glossary.html">Glossary</a><br/>
- <span class="linkdescr">the most important terms explained</span></p>
- </td><td width="50%">
- <p class="biglink"><a class="biglink" href="search.html">Search page</a><br/>
- <span class="linkdescr">search this documentation</span></p>
- <p class="biglink"><a class="biglink" href="contents.html">Complete Table of Contents</a><br/>
- <span class="linkdescr">lists all sections and subsections</span></p>
- </td></tr>
- </table>
-
- <p><strong>Meta information:</strong></p>
- <table class="contentstable" align="center"><tr>
- <td width="50%">
- <p class="biglink"><a class="biglink" href="bugs.html">Reporting bugs</a></p>
- <p class="biglink"><a class="biglink" href="about.html">About the documentation</a></p>
- </td><td width="50%">
- <p class="biglink"><a class="biglink" href="license.html">History and License of Python</a></p>
- <p class="biglink"><a class="biglink" href="copyright.html">Copyright</a></p>
- </td></tr>
- </table>
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
- <div class="sphinxsidebarwrapper"><h3>Download</h3>
-<p><a href="download.html">Download these documents</a></p>
-<h3>Docs for other versions</h3>
-<ul>
- <li><a href="https://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
- <li><a href="https://docs.python.org/3.5/">Python 3.5 (stable)</a></li>
- <li><a href="https://docs.python.org/3.7/">Python 3.7 (in development)</a></li>
- <li><a href="https://www.python.org/doc/versions/">Old versions</a></li>
-</ul>
-
-<h3>Other resources</h3>
-<ul>
-
- <li><a href="https://www.python.org/dev/peps/">PEP Index</a></li>
- <li><a href="https://wiki.python.org/moin/BeginnersGuide">Beginner's Guide</a></li>
- <li><a href="https://wiki.python.org/moin/PythonBooks">Book List</a></li>
- <li><a href="https://www.python.org/doc/av/">Audio/Visual Talks</a></li>
-</ul>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related" role="navigation" aria-label="related navigation">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="py-modindex.html" title="Python Module Index"
- >modules</a> |</li>
- <li><img src="_static/py.png" alt=""
- style="vertical-align: middle; margin-top: -1px"/></li>
- <li><a href="https://www.python.org/">Python</a> »</li>
- <li>
- <span class="version_switcher_placeholder">3.6.2</span>
- <a href="#">Documentation </a> »
- </li>
-
- <li class="right">
-
-
- <div class="inline-search" style="display: none" role="search">
- <form class="inline-search" action="search.html" method="get">
- <input placeholder="Quick search" type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- </div>
- <script type="text/javascript">$('.inline-search').show(0);</script>
- |
- </li>
-
- </ul>
- </div>
- <div class="footer">
- © <a href="copyright.html">Copyright</a> 2001-2017, Python Software Foundation.
- <br />
- The Python Software Foundation is a non-profit corporation.
- <a href="https://www.python.org/psf/donations/">Please donate.</a>
- <br />
- Last updated on Jul 20, 2017.
- <a href="bugs.html">Found a bug</a>?
- <br />
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3.3.
- </div>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 51814cb..d9f3200 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,3 @@ override_dh_auto_clean:
dh_auto_clean
-rm distributed/bokeh/export_tool.js
# -rm docs/source/_static/mathjax
-
-# Update cached intersphinx inventories
-update-objects.inv:
- curl -L -o ./debian/python-objects.inv https://docs.python.org/3
- curl -L -o ./debian/numpy-objects.inv https://docs.scipy.org/doc/numpy
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dask.distributed.git
More information about the Python-modules-commits
mailing list