New upstream version 0.18.2

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

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

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

dulwich/__init__.py

@@ -22,4 +22,4 @@
 
 """Python implementation of the Git file formats and protocols."""
 
-__version__ = (0, 18, 1)
+__version__ = (0, 18, 2)

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@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@nodomain.com>
 Committer: Test Committer <test@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
 """)
 
 

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@nodomain.com>',
                  'author_time': default_time,
                  'author_timezone': 0,

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