From dae6508548ae23c9236036ccaf180ab575cf43fb Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sep 13 2015 22:24:10 +0000
Subject: Update to release 0.1.37 (rhbz#1259100)


- Remove upstreamed patch

---

diff --git a/.gitignore b/.gitignore
index a9607b9..a500c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /vcstools-0.1.32-7effcc5.tar.gz
 /vcstools-0.1.35-a6a0ee4.tar.gz
 /vcstools-0.1.36-299bf21.tar.gz
+/vcstools-0.1.37-768f477.tar.gz
diff --git a/python-vcstools-0.1.36-test-fixes.patch b/python-vcstools-0.1.36-test-fixes.patch
deleted file mode 100644
index ebfcd2d..0000000
--- a/python-vcstools-0.1.36-test-fixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 562de2be781eda9a1ef7c2cee36ba71296836070 Mon Sep 17 00:00:00 2001
-From: Scott K Logan <logans@cottsay.net>
-Date: Sun, 14 Dec 2014 04:21:27 -0800
-Subject: [PATCH] Fix test for git >= 1.8.2
-
-The behavior of --depth changed in 1.8.2. Previously, when --depth=n was specified,
-the most recent n + 1 commits were present in the clone. In 1.8.2 and newer, the most
-recent n commits are.
-
-See https://raw.githubusercontent.com/gitster/git/master/Documentation/RelNotes/1.8.2.txt
----
- test/test_git.py | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_git.py b/test/test_git.py
-index b250f8f..7921627 100644
---- a/test/test_git.py
-+++ b/test/test_git.py
-@@ -43,6 +43,7 @@
- import threading
- import time
- 
-+from distutils.version import LooseVersion
- from vcstools import GitClient
- from vcstools.vcs_base import VcsError
- 
-@@ -236,9 +237,13 @@ def test_checkout_shallow(self):
-         self.assertEqual(client.get_branch(), "master")
-         self.assertEqual(client.get_branch_parent(), "master")
-         po = subprocess.Popen("git log --pretty=format:%H", shell=True, cwd=self.local_path, stdout=subprocess.PIPE)
--        log = po.stdout.read().decode('UTF-8').splitlines()
--        # shallow only contains last 2 commits
--        self.assertEqual(2, len(log), log)
-+        log = po.stdout.read().decode('UTF-8').strip().splitlines()
-+        if LooseVersion(client.gitversion) >= LooseVersion('1.8.2'):
-+            # shallow only contains last commit
-+            self.assertEqual(1, len(log), log)
-+        else:
-+            # shallow only contains last 2 commits
-+            self.assertEqual(2, len(log), log)
- 
-     def test_checkout_specific_version_and_update(self):
-         url = self.remote_path
-From c3176b498266bbb06553f67896e342c2ce62ea73 Mon Sep 17 00:00:00 2001
-From: Scott K Logan <logans@cottsay.net>
-Date: Sun, 14 Dec 2014 04:23:40 -0800
-Subject: [PATCH] Fix race condition in testing
-
-If the git timeout test is run on a machine which can run many threads,
-the TCP server finishes the call to `handle` and resets the connection
-before the timeout has occurred, and the test fails.
----
- test/test_git.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/test_git.py b/test/test_git.py
-index 7921627..d577278 100644
---- a/test/test_git.py
-+++ b/test/test_git.py
-@@ -774,7 +774,9 @@ class GitTimeoutTest(unittest.TestCase):
- 
-     class MuteHandler(BaseRequestHandler):
-         def handle(self):
--            self.request.recv(1024)
-+            data = True
-+            while data:
-+                data = self.request.recv(1024)
- 
-     @classmethod
-     def setUpClass(self):
diff --git a/python-vcstools.spec b/python-vcstools.spec
index d0469cd..3c749a2 100644
--- a/python-vcstools.spec
+++ b/python-vcstools.spec
@@ -1,4 +1,4 @@
-%global commit 299bf21181dfee6e20d710d9af83c20cba584d27
+%global commit 768f477a17e45cde8b57baed84e7661f601b73aa
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global realname vcstools
 
@@ -11,15 +11,13 @@
 %endif
 
 Name:           python-%{realname}
-Version:        0.1.36
-Release:        2%{?dist}
+Version:        0.1.37
+Release:        1%{?dist}
 Summary:        Version Control System tools for Python
 
 License:        BSD
 URL:            http://www.ros.org/wiki/vcstools
 Source0:        https://github.com/%{realname}/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz
-# Fix some broken tests (submitted upstream)
-Patch0:         %{name}-0.1.36-test-fixes.patch
 
 BuildArch:      noarch
 
@@ -83,7 +81,6 @@ Its main use is to support the rosinstall tool.
 
 %prep
 %setup -qn %{realname}-%{commit}
-%patch0 -p1
 sed -i 's/haiku/default/' doc/conf.py
 sed -i 's/:special-members://' doc/vcstools.rst
 
@@ -168,6 +165,10 @@ popd
 %endif # with_python3
 
 %changelog
+* Sun Sep 13 2015 Rich Mattes <richmattes@gmail.com> - 0.1.37-1
+- Update to release 0.1.37 (rhbz#1259100)
+- Remove upstreamed patch
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 6cec6b9..994d4f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03dab58a8c8a5b112bd981d7194e0cb7  vcstools-0.1.36-299bf21.tar.gz
+ffeeaa925bbe7d3482a249e4365746d1  vcstools-0.1.37-768f477.tar.gz