[Python-modules-commits] [python-attrs] 09/15: 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 e47589ab44dabd20903311c39d74fcf925f922cc
Merge: 5c9d28d 3b8aee4
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Fri Jun 30 03:55:00 2017 +0200

    merge patched into master

 debian/.git-dpm                                            |  4 ++--
 .../0002-Add-build-directory-to-sys.path-for-autodoc.patch | 14 ++++++++------
 docs/conf.py                                               |  4 +++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 0e0dec9,0000000..bfc408b
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
- 73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd
- 73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd
++3b8aee49df1c6d64ed95e45b20fc463cc2af8be2
++3b8aee49df1c6d64ed95e45b20fc463cc2af8be2
 +5f47c131690f268c584cb69b4f88d6b50986b57e
 +5f47c131690f268c584cb69b4f88d6b50986b57e
 +python-attrs_17.2.0.orig.tar.gz
 +d8c4c3268524de54410fbe4f3a32db9c9de0c843
 +70313
 +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 9476a14,0000000..58a3945
mode 100644,000000..100644
--- a/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
+++ b/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
@@@ -1,25 -1,0 +1,27 @@@
- From 73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd Mon Sep 17 00:00:00 2001
++From 3b8aee49df1c6d64ed95e45b20fc463cc2af8be2 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 | 5 +++++
-  1 file changed, 5 insertions(+)
++ docs/conf.py | 7 +++++++
++ 1 file changed, 7 insertions(+)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 52a04e7..15a41b7 100644
++index 52a04e7..e08b9ed 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
- @@ -27,6 +27,11 @@ def find_version(*file_paths):
++@@ -27,6 +27,13 @@ def find_version(*file_paths):
 +         return version_match.group(1)
 +     raise RuntimeError("Unable to find version string.")
 + 
 ++# 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.
 ++import sys
- +sys.path.insert(0, os.path.abspath('../.pybuild/pythonX.Y_3.5/build'))
+++ver = sys.version_info[0:2]
+++sys.path.insert(
+++    0, os.path.abspath('../.pybuild/pythonX.Y_{0}.{1}/build'.format(*ver)))
 + 
 + # -- General configuration ------------------------------------------------
 + 

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