[Python-modules-commits] [python-testfixtures] 05/07: change version to 4.13.4-1 (UNRELEASED) New upstream release.
Michael Fladischer
fladi at moszumanska.debian.org
Fri Feb 17 10:59:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-testfixtures.
commit 804be773970723de3b03de62c7b1c5c6aaac2040
Merge: 7ff895d 34282a7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Feb 17 11:05:10 2017 +0100
change version to 4.13.4-1 (UNRELEASED)
New upstream release.
debian/.git-dpm | 6 +++---
debian/changelog | 6 ++++++
debian/patches/0001-Use-local-objects.inv-where-possible.patch | 6 +++---
.../patches/0002-Do-not-duplicate-license-in-documentation.patch | 2 +-
docs/changes.txt | 7 +++++++
docs/conf.py | 4 +++-
testfixtures/tests/test_compare.py | 3 +++
testfixtures/version.txt | 2 +-
8 files changed, 27 insertions(+), 9 deletions(-)
diff --cc debian/.git-dpm
index 31c557e,0000000..51dbda7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069
- 38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069
- bdb10da94ce984ae8dd3926ee24f256b869e0b73
++34282a757369b2075489e345a3e2b6ef1d9bf81a
++34282a757369b2075489e345a3e2b6ef1d9bf81a
++b3abbb47901caf30202a2f0c6607aa9cf7e98c94
+b3abbb47901caf30202a2f0c6607aa9cf7e98c94
+python-testfixtures_4.13.4.orig.tar.gz
+9e38a1617ac8174ad4ab835d69bc5429140cc296
+93655
diff --cc debian/changelog
index 7e760f1,0000000..a758543
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,11 @@@
++python-testfixtures (4.13.4-1) UNRELEASED; urgency=low
++
++ * New upstream release.
++
++ -- Michael Fladischer <fladi at debian.org> Fri, 17 Feb 2017 11:05:10 +0100
++
+python-testfixtures (4.13.3-1) unstable; urgency=low
+
+ * Initial release (Closes: #852783).
+
+ -- Michael Fladischer <fladi at debian.org> Thu, 26 Jan 2017 17:34:20 +0100
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index 2f7ed07,0000000..cf19f41
mode 100644,000000..100644
--- a/debian/patches/0001-Use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-Use-local-objects.inv-where-possible.patch
@@@ -1,35 -1,0 +1,35 @@@
- From ef4865dec81eaa5dd24c6c07edbffc10db783e36 Mon Sep 17 00:00:00 2001
++From af210a630e6be7a63508b06b6f0c28826f408325 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Fri, 27 Jan 2017 09:50:38 +0100
+Subject: Use local objects.inv where possible
+
+Upstream uses intersphinx mappings that fetch the objects.inv for python by
+HTTP from a remote host. Using the local objects.inv from python enables the
+package to build without network connection.
+---
+ docs/conf.py | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 602454b..48b009b 100644
++index 3a340fd..6cc40b0 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -12,7 +12,17 @@ extensions = [
++@@ -14,7 +14,17 @@ extensions = [
+ 'sphinx.ext.intersphinx'
+ ]
+
+-intersphinx_mapping = {'http://docs.python.org': None}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'https://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
+
+ # General
+ source_suffix = '.txt'
diff --cc debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
index 107edc7,0000000..09a3d2d
mode 100644,000000..100644
--- a/debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
+++ b/debian/patches/0002-Do-not-duplicate-license-in-documentation.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 38e5cdaecaa7fcf73ce07a90e63c73b0d8d54069 Mon Sep 17 00:00:00 2001
++From 34282a757369b2075489e345a3e2b6ef1d9bf81a Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Fri, 27 Jan 2017 09:54:15 +0100
+Subject: Do not duplicate license in documentation.
+
+---
+ docs/index.txt | 1 -
+ docs/license.txt | 5 -----
+ 2 files changed, 6 deletions(-)
+ delete mode 100644 docs/license.txt
+
+diff --git a/docs/index.txt b/docs/index.txt
+index cbd65e0..c0b8433 100644
+--- a/docs/index.txt
++++ b/docs/index.txt
+@@ -38,7 +38,6 @@ development, please see the sections below:
+ installation.txt
+ development.txt
+ changes.txt
+- license.txt
+
+ Indices and tables
+ ==================
+diff --git a/docs/license.txt b/docs/license.txt
+deleted file mode 100644
+index b383c6e..0000000
+--- a/docs/license.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-=======
+-License
+-=======
+-
+-.. literalinclude:: ../LICENSE.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-testfixtures.git
More information about the Python-modules-commits
mailing list