[ros-wstool] 01/02: Replace vcs patch with upstream version

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-wstool.

commit 8e948444bf7551aaa49e5beb5649879a7fcd393a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jul 25 21:26:40 2017 +0200

    Replace vcs patch with upstream version
---
 .../0002-Add-fake-identity-for-VCSs-104.patch      | 80 ++++++++++++++++++++++
 .../patches/0002-Add-fake-identity-for-VCSs.patch  | 20 ------
 debian/patches/series                              |  2 +-
 3 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0002-Add-fake-identity-for-VCSs-104.patch b/debian/patches/0002-Add-fake-identity-for-VCSs-104.patch
new file mode 100644
index 0000000..35ebd5e
--- /dev/null
+++ b/debian/patches/0002-Add-fake-identity-for-VCSs-104.patch
@@ -0,0 +1,80 @@
+From: Jochen Sprickerhof <github at jochen.sprickerhof.de>
+Date: Tue, 25 Jul 2017 11:22:20 +0200
+Subject: Add fake identity for VCSs (#104)
+
+* Add fake identity for VCSs
+
+This makes the unit tests self contained.
+
+* stop testing unsupported Python versions
+
+* install coverage too
+
+* Update .travis.yml
+
+* Update .travis.yml
+
+* make sure correct python is being used
+
+* the test structure layout is strange in this repo
+
+* Add author name and mail for git
+---
+ .travis.yml           | 21 ++++++---------------
+ test/scm_test_base.py |  4 ++++
+ 2 files changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 90893b6..ae235a4 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,28 +1,19 @@
+ language: python
+ python:
+-  - "2.6"
+   - "2.7"
+-  - "3.2"
+-  - "3.3"
+   - "3.4"
++  - "3.5"
+ # command to install dependencies
+ install:
+-# develop seems to be required by travis since 02/2013
+-  - python setup.py build develop
++  - python setup.py install
+   - sudo apt-get clean
+-  - sudo apt-get install -qq zsh
+-  - sudo pip install vcstools nose-cov coverage pyyaml coveralls
+-# Set git config to silence some stuff in the tests
+-  - git config --global user.email "foo at example.com"
+-  - git config --global user.name "Foo Bar"
+-# Set the hg user
+-  - echo -e "[ui]\nusername = Your Name <your at mail.com>" >> ~/.hgrc
+-# Set the bzr user
+-  - bzr whoami "Your Name <name at example.com>"
++  - sudo apt-get update && sudo apt-get install -qq zsh
++  - python -m pip install vcstools nose coverage pyyaml coveralls
+ # command to run tests
+ script:
+   - python -c 'import sys; print(sys.path)'
+-  - nosetests --with-coverage --cover-package=wstool
++  - python -c 'import coverage'
++  - python -m nose --with-coverage --cover-package=wstool test/local
+ notifications:
+   email: false
+ after_success:
+diff --git a/test/scm_test_base.py b/test/scm_test_base.py
+index 6125f7d..f31410a 100644
+--- a/test/scm_test_base.py
++++ b/test/scm_test_base.py
+@@ -126,6 +126,10 @@ class AbstractRosinstallCLITest(unittest.TestCase):
+     """Base class for cli tests"""
+     @classmethod
+     def setUpClass(self):
++        os.environ['GIT_AUTHOR_NAME'] = 'Your Name'
++        os.environ['GIT_COMMITTER_NAME'] = 'Your Name'
++        os.environ['GIT_AUTHOR_EMAIL'] = 'name at example.com'
++        os.environ['EMAIL'] = 'Your Name <name at example.com>'
+         self.new_environ = copy.copy(os.environ)
+         self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
+         if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/0002-Add-fake-identity-for-VCSs.patch b/debian/patches/0002-Add-fake-identity-for-VCSs.patch
deleted file mode 100644
index eed5d9b..0000000
--- a/debian/patches/0002-Add-fake-identity-for-VCSs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 18 Jul 2017 09:38:43 +0200
-Subject: Add fake identity for VCSs
-
----
- test/scm_test_base.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/scm_test_base.py b/test/scm_test_base.py
-index 6125f7d..7267221 100644
---- a/test/scm_test_base.py
-+++ b/test/scm_test_base.py
-@@ -126,6 +126,7 @@ class AbstractRosinstallCLITest(unittest.TestCase):
-     """Base class for cli tests"""
-     @classmethod
-     def setUpClass(self):
-+        os.environ['EMAIL'] = 'Your Name <name at example.com>'
-         self.new_environ = copy.copy(os.environ)
-         self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
-         if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/series b/debian/patches/series
index 63a9782..4ddfddc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix-location-of-completion-scripts.patch
-0002-Add-fake-identity-for-VCSs.patch
+0002-Add-fake-identity-for-VCSs-104.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-wstool.git