[Python-modules-commits] [pymodbus] 03/04: switch to new upstream and add python3 and doc package ugly mega-commit, sorry
Wolfgang Borgert
debacle at moszumanska.debian.org
Thu May 18 08:29: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 6770d99ba7d9db3495e246e0732f5d4fdd748754
Author: W. Martin Borgert <debacle at debian.org>
Date: Thu May 18 10:04:11 2017 +0200
switch to new upstream and add python3 and doc package
ugly mega-commit, sorry
---
debian/compat | 2 +-
debian/control | 77 ++++++++++++++++++++++++++++++++++---
debian/copyright | 5 ++-
debian/patches/series | 1 +
debian/patches/tmp-disable-test | 25 ++++++++++++
debian/python-pymodbus-doc.docs | 1 +
debian/python-pymodbus-doc.examples | 1 +
debian/python-pymodbus.docs | 1 -
debian/rules | 20 ++--------
9 files changed, 108 insertions(+), 25 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 4bcdc77..9eb4fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,32 @@ Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.
Uploaders: W. Martin Borgert <debacle at debian.org>,
Maximiliano Curia <maxy at debian.org>,
Thomas Bechtold <thomasbechtold at jpberlin.de>
-Build-Depends: debhelper (>= 7.0.50~), python, python-setuptools, python-nose, dh-python, python-twisted
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10~),
+ dh-python,
+ python,
+ python-mock,
+ python-nose,
+ python-serial,
+ python-setuptools,
+ python-sphinx,
+ python-twisted,
+ python3,
+ python3-mock,
+ python3-nose,
+ python3-serial,
+ python3-setuptools,
+ python3-twisted
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pymodbus.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pymodbus.git
-Homepage: https://github.com/bashwork/pymodbus
+Homepage: https://github.com/riptideio/pymodbus
Package: python-pymodbus
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python-twisted-core, python-serial
+Recommends: python-twisted-core
Provides: ${python:Provides}
-Description: full Modbus protocol implementation
+Description: full Modbus protocol implementation for Python 2
Pymodbus is a full Modbus protocol implementation.
It is currently supports the following :
.
@@ -37,3 +51,56 @@ Description: full Modbus protocol implementation
For serial communication, you need python-serial.
.
This package provides the Python 2.x module.
+
+Package: python3-pymodbus
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python3-twisted
+Provides: ${python3:Provides}
+Description: full Modbus protocol implementation for Python 3
+ Pymodbus is a full Modbus protocol implementation.
+ It is currently supports the following :
+ .
+ Client Features:
+ * Can perform single get/set on discrete and registers
+ * Can perform multiple get/set on discrete and registers
+ * Working on diagnostic/file/pipe/setting/info requests
+ * Can fully scrape a host to be cloned
+ .
+ Server Features:
+ * Can function as a fully implemented TCP/ASCII modbus server
+ * Full server control context
+ * Working on serial communication
+ * Working on functioning as a RTU
+ * Can mimic a server based on the supplied input data
+ .
+ For asynchronous communication, you need python-twisted-core.
+ For serial communication, you need python-serial.
+ .
+ This package provides the Python 3.x module.
+
+Package: python-pymodbus-doc
+Section: doc
+Architecture: all
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: full Modbus protocol implementation, documentation
+ Pymodbus is a full Modbus protocol implementation.
+ It is currently supports the following :
+ .
+ Client Features:
+ * Can perform single get/set on discrete and registers
+ * Can perform multiple get/set on discrete and registers
+ * Working on diagnostic/file/pipe/setting/info requests
+ * Can fully scrape a host to be cloned
+ .
+ Server Features:
+ * Can function as a fully implemented TCP/ASCII modbus server
+ * Full server control context
+ * Working on serial communication
+ * Working on functioning as a RTU
+ * Can mimic a server based on the supplied input data
+ .
+ For asynchronous communication, you need python-twisted-core.
+ For serial communication, you need python-serial.
+ .
+ This package provides the documentation and examples.
diff --git a/debian/copyright b/debian/copyright
index 52e9cb3..cba238f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pymodbus
-Source: https://github.com/bashwork/pymodbus
+Source: https: https://github.com/riptideio/pymodbus
Files: pymodbus/__init__.py
Copyright: 2001-2005 S.W.A.C. GmbH, Germany,
@@ -9,7 +9,8 @@ Copyright: 2001-2005 S.W.A.C. GmbH, Germany,
License: BSD-3-clause
Files: *
-Copyright: 2008-2014 Galen Collins <bashwork at gmail.com>
+Copyright: 2008-2017 Galen Collins <bashwork at gmail.com>
+ 2017 Sanju Dhoomakethu <otlasanju at gmail.com>
License: BSD-3-clause
Files: debian/*
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..106e24c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tmp-disable-test
diff --git a/debian/patches/tmp-disable-test b/debian/patches/tmp-disable-test
new file mode 100644
index 0000000..727650f
--- /dev/null
+++ b/debian/patches/tmp-disable-test
@@ -0,0 +1,25 @@
+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'
diff --git a/debian/python-pymodbus-doc.docs b/debian/python-pymodbus-doc.docs
new file mode 100644
index 0000000..6d28621
--- /dev/null
+++ b/debian/python-pymodbus-doc.docs
@@ -0,0 +1 @@
+build/html
diff --git a/debian/python-pymodbus-doc.examples b/debian/python-pymodbus-doc.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/python-pymodbus-doc.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/python-pymodbus.docs b/debian/python-pymodbus.docs
deleted file mode 100644
index 1e107f5..0000000
--- a/debian/python-pymodbus.docs
+++ /dev/null
@@ -1 +0,0 @@
-examples
diff --git a/debian/rules b/debian/rules
index a9c07e8..44f8b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,20 +8,8 @@ export http_proxy = http://127.0.0.1:9
export https_proxy = https://127.0.0.1:9
%:
- dh $@ --buildsystem=pybuild --with python2
+ dh $@ --buildsystem=pybuild --with python2,python3,sphinxdoc
-override_dh_install:
- dh_install -Xez_setup.py
-
-override_dh_installdocs:
- dh_installdocs -Xtest/
-
-override_dh_python2:
- dh_python2 --no-guessing-deps
-
-override_dh_auto_test:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
- set -e ; for pyvers in 2.7; do \
- echo WARNING: not running python$$pyvers setup.py test; \
- done
-endif
+override_dh_auto_build:
+ dh_auto_build
+ PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/sphinx build/html
--
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