[Python-modules-commits] [python-attrs] 07/11: merge patched into master

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-attrs.

commit 7bc64667755c851e7c5cdf9403b89c9fcb4b69d8
Merge: 01c1935 f3e629e
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Mon Oct 10 04:42:33 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-build-directory-to-sys.path-for-autodoc.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 3953e3a,0000000..d87b7dd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- d122a2c17dd09a713f59a73a1b2b035aec93a825
- d122a2c17dd09a713f59a73a1b2b035aec93a825
++f3e629e9b8f36869592086e85ad1d5ee294a73ef
++f3e629e9b8f36869592086e85ad1d5ee294a73ef
 +02ab5d9c3a881e4198d291bc7b69b58616faf533
 +02ab5d9c3a881e4198d291bc7b69b58616faf533
 +python-attrs_16.2.0.orig.tar.gz
 +c406dab4789ed7260fd2718037acb7ad039dcef4
 +49512
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
index 0000000,0000000..5c860dc
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
@@@ -1,0 -1,0 +1,23 @@@
++From f3e629e9b8f36869592086e85ad1d5ee294a73ef Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at mithrandi.net>
++Date: Mon, 10 Oct 2016 04:42:22 +0200
++Subject: Add build directory to sys.path for autodoc.
++
++---
++ docs/conf.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index bcff855..6c4ea71 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -47,7 +47,8 @@ def find_version(*file_paths):
++ # If extensions (or modules to document with autodoc) are in another directory,
++ # add these directories to sys.path here. If the directory is relative to the
++ # documentation root, use os.path.abspath to make it absolute, like shown here.
++-#sys.path.insert(0, os.path.abspath('.'))
+++import sys
+++sys.path.insert(0, os.path.abspath('../.pybuild/pythonX.Y_3.5/build'))
++ 
++ # -- General configuration ------------------------------------------------
++ 
diff --cc debian/patches/series
index 101b98b,0000000..443058a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Point-intersphinx_mapping-at-local-Python-docs.patch
++0002-Add-build-directory-to-sys.path-for-autodoc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-attrs.git