[Python-modules-commits] [dulwich] 01/05: New upstream version 0.18.2

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository dulwich.

commit 9675e9ea207bbd6ba748f6f035557c742a7218d3
Author: Jelmer Vernooij <jelmer at debian.org>
Date:   Tue Aug 1 23:19:03 2017 +0000

    New upstream version 0.18.2
---
 NEWS                            |  7 +++++++
 PKG-INFO                        |  2 +-
 dulwich.egg-info/PKG-INFO       |  2 +-
 dulwich/__init__.py             |  2 +-
 dulwich/tests/test_porcelain.py | 22 +++++++++++-----------
 dulwich/tests/utils.py          |  2 +-
 setup.py                        |  2 +-
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index fb5dea9..99920e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+0.18.2	2017-08-01
+
+ TEST FIXES
+
+  * Use constant timestamp so tests pass in all timezones, not just BST.
+    (Jelmer Vernooij)
+
 0.18.1	2017-07-31
 
  BUG FIXES
diff --git a/PKG-INFO b/PKG-INFO
index ac7f7c5..834c980 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: dulwich
-Version: 0.18.1
+Version: 0.18.2
 Summary: Python Git Library
 Home-page: https://www.dulwich.io/
 Author: UNKNOWN
diff --git a/dulwich.egg-info/PKG-INFO b/dulwich.egg-info/PKG-INFO
index ac7f7c5..834c980 100644
--- a/dulwich.egg-info/PKG-INFO
+++ b/dulwich.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: dulwich
-Version: 0.18.1
+Version: 0.18.2
 Summary: Python Git Library
 Home-page: https://www.dulwich.io/
 Author: UNKNOWN
diff --git a/dulwich/__init__.py b/dulwich/__init__.py
index 99b14fa..c3a4000 100644
--- a/dulwich/__init__.py
+++ b/dulwich/__init__.py
@@ -22,4 +22,4 @@
 
 """Python implementation of the Git file formats and protocols."""
 
-__version__ = (0, 18, 1)
+__version__ = (0, 18, 2)
diff --git a/dulwich/tests/test_porcelain.py b/dulwich/tests/test_porcelain.py
index f7e0f18..6a24f87 100644
--- a/dulwich/tests/test_porcelain.py
+++ b/dulwich/tests/test_porcelain.py
@@ -385,7 +385,7 @@ class ShowTests(PorcelainTestCase):
         self.repo.object_store.add_objects([(a, None), (ta, None), (ca, None)])
         outstream = StringIO()
         porcelain.show(self.repo.path, objects=[ca.id], outstream=outstream)
-        self.assertEqual(outstream.getvalue(), """\
+        self.assertMultiLineEqual(outstream.getvalue(), """\
 --------------------------------------------------
 commit: 344da06c1bb85901270b3e8875c988a027ec087d
 Author: Test Author <test at nodomain.com>
@@ -410,29 +410,29 @@ index 0000000..ea5c7bf 100644
         ca = make_commit(tree=ta.id)
         b = Blob.from_string(b"The Bar\n")
         tb = Tree()
-        tb.add(b"somename", 0o100644, a.id)
-        cb = make_commit(tree=tb.id)
+        tb.add(b"somename", 0o100644, b.id)
+        cb = make_commit(tree=tb.id, parents=[ca.id])
         self.repo.object_store.add_objects(
             [(a, None), (b, None), (ta, None), (tb, None),
              (ca, None), (cb, None)])
         outstream = StringIO()
         porcelain.show(self.repo.path, objects=[cb.id], outstream=outstream)
-        self.assertEqual(outstream.getvalue(), """\
+        self.assertMultiLineEqual(outstream.getvalue(), """\
 --------------------------------------------------
-commit: 344da06c1bb85901270b3e8875c988a027ec087d
+commit: 2c6b6c9cb72c130956657e1fdae58e5b103744fa
 Author: Test Author <test at nodomain.com>
 Committer: Test Committer <test at nodomain.com>
 Date:   Fri Jan 01 2010 00:00:00 +0000
 
 Test message.
 
-diff --git /dev/null b/somename
-new mode 100644
-index 0000000..ea5c7bf 100644
---- /dev/null
+diff --git a/somename b/somename
+index ea5c7bf..fd38bcb 100644
+--- a/somename
 +++ b/somename
-@@ -1,0 +1,1 @@
-+The Foo
+@@ -1,1 +1,1 @@
+-The Foo
++The Bar
 """)
 
 
diff --git a/dulwich/tests/utils.py b/dulwich/tests/utils.py
index b0d2d0e..cfe446b 100644
--- a/dulwich/tests/utils.py
+++ b/dulwich/tests/utils.py
@@ -126,7 +126,7 @@ def make_commit(**attrs):
     :param attrs: dict of attributes to overwrite from the default values.
     :return: A newly initialized Commit object.
     """
-    default_time = int(time.mktime(datetime.datetime(2010, 1, 1).timetuple()))
+    default_time = 1262304000  # 2010-01-01 00:00:00
     all_attrs = {'author': b'Test Author <test at nodomain.com>',
                  'author_time': default_time,
                  'author_timezone': 0,
diff --git a/setup.py b/setup.py
index f1276fa..9c28eed 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.core import Distribution
 import os
 import sys
 
-dulwich_version_string = '0.18.1'
+dulwich_version_string = '0.18.2'
 
 include_dirs = []
 # Windows MSVC support

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