[Python-modules-commits] [python-hypothesis] 06/07: 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-hypothesis.

commit fe98e49e10eb8736e4490a78ea2deb6a3df487b4
Merge: 795bbec ab18fca
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri Jul 7 14:44:00 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 debian/patches/0001-Delay-__version__-import.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 1dadc34,0000000..fb55a38
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
- 766cc744a17729331948321ed5e4bf235839a771
- 766cc744a17729331948321ed5e4bf235839a771
++ab18fca80e13e14bb6b40c4878a828605c517726
++ab18fca80e13e14bb6b40c4878a828605c517726
 +766cc744a17729331948321ed5e4bf235839a771
 +766cc744a17729331948321ed5e4bf235839a771
 +python-hypothesis_3.12.0.orig.tar.gz
 +5a981ccac589a5ca5e8a44f1b9197a4e43050abd
 +343036
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Delay-__version__-import.patch
index 0000000,0000000..ad26bb9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Delay-__version__-import.patch
@@@ -1,0 -1,0 +1,30 @@@
++From ab18fca80e13e14bb6b40c4878a828605c517726 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Fri, 7 Jul 2017 14:43:57 +0200
++Subject: Delay __version__ import.
++
++---
++ docs/conf.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index ee65926..4a84cba 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -24,14 +24,14 @@ import os
++ import sys
++ import datetime
++ 
++-from hypothesis import __version__
++-
++ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
++ 
++ sys.path.append(
++     os.path.join(os.path.dirname(__file__), '..', 'src')
++ )
++ 
+++from hypothesis import __version__
+++
++ 
++ autodoc_member_order = 'bysource'
++ 
diff --cc debian/patches/series
index 0000000,0000000..9e34d14
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Delay-__version__-import.patch

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