[Python-modules-commits] r33871 - in packages/python-git/trunk/debian (4 files)

[yoh at users.alioth.debian.org]

    Date: Tuesday, August 18, 2015 @ 22:02:15
  Author: yoh
Revision: 33871

New changelog entry + dropping absorbed patches

Modified:
  packages/python-git/trunk/debian/changelog
  packages/python-git/trunk/debian/patches/series
Deleted:
  packages/python-git/trunk/debian/patches/up_respect_git_python_test_env_var
  packages/python-git/trunk/debian/patches/up_skiptest_if_filesystem_without_unicode

Modified: packages/python-git/trunk/debian/changelog
===================================================================
--- packages/python-git/trunk/debian/changelog	2015-08-18 20:11:38 UTC (rev 33870)
+++ packages/python-git/trunk/debian/changelog	2015-08-18 22:02:15 UTC (rev 33871)
@@ -1,3 +1,11 @@
+python-git (0.3.6+git28-g88f3dc2-1) experimental; urgency=medium
+
+  * Fresh upstream snapshot with a variety of bugs fixed, e.g.
+    running hooks from cwd which caused problems with annex repos
+    - all up_* patches were adopted upstream, thus dropped here
+
+ -- Yaroslav Halchenko <debian at onerussian.com>  Fri, 06 Mar 2015 23:00:41 -0500
+
 python-git (0.3.6+git5-gd8bbfea-1) experimental; urgency=medium
 
   * New post-release snapshot with some fixes (Closes: #769595)

Modified: packages/python-git/trunk/debian/patches/series
===================================================================
--- packages/python-git/trunk/debian/patches/series	2015-08-18 20:11:38 UTC (rev 33870)
+++ packages/python-git/trunk/debian/patches/series	2015-08-18 22:02:15 UTC (rev 33871)
@@ -1,2 +0,0 @@
-up_respect_git_python_test_env_var
-up_skiptest_if_filesystem_without_unicode

Deleted: packages/python-git/trunk/debian/patches/up_respect_git_python_test_env_var
===================================================================
--- packages/python-git/trunk/debian/patches/up_respect_git_python_test_env_var	2015-08-18 20:11:38 UTC (rev 33870)
+++ packages/python-git/trunk/debian/patches/up_respect_git_python_test_env_var	2015-08-18 22:02:15 UTC (rev 33871)
@@ -1,11 +0,0 @@
---- a/git/test/lib/helper.py
-+++ b/git/test/lib/helper.py
-@@ -15,7 +15,7 @@ import io
- from git import Repo, Remote, GitCommandError, Git
- from git.compat import string_types
- 
--GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-+GIT_REPO = os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE", os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))
- 
- __all__ = (
-     'fixture_path', 'fixture', 'absolute_project_path', 'StringProcessAdapter',

Deleted: packages/python-git/trunk/debian/patches/up_skiptest_if_filesystem_without_unicode
===================================================================
--- packages/python-git/trunk/debian/patches/up_skiptest_if_filesystem_without_unicode	2015-08-18 20:11:38 UTC (rev 33870)
+++ packages/python-git/trunk/debian/patches/up_skiptest_if_filesystem_without_unicode	2015-08-18 22:02:15 UTC (rev 33871)
@@ -1,27 +0,0 @@
-Index: python-git-0.3.6+git5-gd8bbfea/git/test/test_base.py
-===================================================================
---- python-git-0.3.6+git5-gd8bbfea.orig/git/test/test_base.py
-+++ python-git-0.3.6+git5-gd8bbfea/git/test/test_base.py
-@@ -5,6 +5,7 @@
- # This module is part of GitPython and is released under
- # the BSD License: http://www.opensource.org/licenses/bsd-license.php
- import os
-+import sys
- import tempfile
- 
- import git.objects.base as base
-@@ -116,6 +117,14 @@ class TestBase(TestBase):
-         filename = u"שלום.txt"
- 
-         file_path = os.path.join(rw_repo.working_dir, filename)
-+
-+        # verify first that we could encode file name in this environment
-+        try:
-+            _ = file_path.encode(sys.getfilesystemencoding())
-+        except UnicodeEncodeError:
-+            from nose import SkipTest
-+            raise SkipTest("Environment doesn't support unicode filenames")
-+
-         open(file_path, "wb").write(b'something')
- 
-         if os.name == 'nt':