[Python-modules-commits] [wifi] 07/11: merge patched into master

[Ethan Ward]

This is an automated email from the git hooks/post-receive script.

ethanward-guest pushed a commit to branch master
in repository wifi.

commit 59e286e08841eeefe57aa78dcd3ae7edba67b761
Merge: 6965dc6 caeba8d
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Tue Jul 25 13:54:49 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Remove-tests-creates-import-error.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c254927,0000000..c24e1a8
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
- 5d9576ae0d751f55c76770921c9b08377c511c83
- 5d9576ae0d751f55c76770921c9b08377c511c83
++caeba8dc53c2a14447fdcb938cdcb978879310a4
++caeba8dc53c2a14447fdcb938cdcb978879310a4
 +5d9576ae0d751f55c76770921c9b08377c511c83
 +5d9576ae0d751f55c76770921c9b08377c511c83
 +wifi_0.3.8.orig.tar.gz
 +d894a40f66f06c64a4d87119474c7515bb3a78ae
 +11964
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-tests-creates-import-error.patch
index 0000000,0000000..7884294
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-tests-creates-import-error.patch
@@@ -1,0 -1,0 +1,22 @@@
++From caeba8dc53c2a14447fdcb938cdcb978879310a4 Mon Sep 17 00:00:00 2001
++From: Ethan Ward <ethan.ward at mycroft.ai>
++Date: Tue, 25 Jul 2017 13:54:42 -0500
++Subject: Remove tests, creates import error
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 9add77d..ccb9a16 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -42,7 +42,7 @@ setup(
++     long_description='\n\n'.join([read('README.rst'), read('CHANGES.rst')]),
++     packages=['wifi'],
++     scripts=['bin/wifi'],
++-    test_suite='tests',
+++    #test_suite='tests',
++     platforms=["Debian"],
++     license='BSD',
++     install_requires=install_requires,
diff --cc debian/patches/series
index 0000000,0000000..25402d5
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-tests-creates-import-error.patch

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