[Python-modules-commits] [pymodbus] 03/05: update patches for new version: add "rm-humanfriendly", remove "tmp-disable-test"
Wolfgang Borgert
debacle at moszumanska.debian.org
Mon May 29 08:07:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch debian/experimental
in repository pymodbus.
commit cbdb0e9279a4c642279be63fa88af0cdafde1b5e
Author: W. Martin Borgert <debacle at debian.org>
Date: Mon May 29 00:46:54 2017 +0200
update patches for new version: add "rm-humanfriendly", remove "tmp-disable-test"
---
debian/patches/rm-humanfriendly | 24 ++++++++++++++++++++++++
debian/patches/series | 2 +-
debian/patches/tmp-disable-test | 25 -------------------------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/debian/patches/rm-humanfriendly b/debian/patches/rm-humanfriendly
new file mode 100644
index 0000000..67709b3
--- /dev/null
+++ b/debian/patches/rm-humanfriendly
@@ -0,0 +1,24 @@
+Description: temporarily remove humanfriendly.sphinx usage, until packaged
+Author: W. Martin Borgert <debacle at debian.org>
+Origin: vendor
+Last-Update: 2017-05-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/sphinx/conf.py
++++ b/doc/sphinx/conf.py
+@@ -37,7 +37,6 @@
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.intersphinx',
+ 'sphinx.ext.viewcode',
+- 'humanfriendly.sphinx',
+ ]
+
+ # Add any paths that contain templates here, relative to this directory.
+@@ -91,7 +90,6 @@
+ intersphinx_mapping = dict(
+ python=('https://docs.python.org/2', None),
+ capturer=('https://capturer.readthedocs.io/en/latest', None),
+- humanfriendly=('https://humanfriendly.readthedocs.io/en/latest', None),
+ )
+
+ # -- Options for HTML output --------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index 106e24c..36293e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-tmp-disable-test
+rm-humanfriendly
diff --git a/debian/patches/tmp-disable-test b/debian/patches/tmp-disable-test
deleted file mode 100644
index 727650f..0000000
--- a/debian/patches/tmp-disable-test
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: temporarily disable one test, that does not work with Python 3
-Author: W. Martin Borgert <debacle at debian.org>
-Origin: vendor
-Bug: https://github.com/riptideio/pymodbus/issues/166
-Last-Update: 2017-05-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/test_mei_messages.py
-+++ b/test/test_mei_messages.py
-@@ -6,6 +6,7 @@
- This fixture tests the functionality of all the
- mei based request/response messages:
- '''
-+import sys
- import unittest
- from pymodbus.mei_message import *
- from pymodbus.constants import DeviceInformation, MoreData
-@@ -66,6 +67,7 @@
- handle.object_id = 0x100
- self.assertEqual(handle.execute(None).function_code, 0xab)
-
-+ @unittest.skipIf(sys.version_info[0] > 2, 'broken with Python 3')
- def testReadDeviceInformationResponseEncode(self):
- ''' Test that the read fifo queue response can encode '''
- message = b'\x0e\x01\x83\x00\x00\x03'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pymodbus.git
More information about the Python-modules-commits
mailing list