Merge pull request #408 from con-f-use/master

 Change ScmVersion.time to UTC

2 files changed, 19 insertions, 2 deletions

diff --git a/src/setuptools_scm/utils.py b/src/setuptools_scm/utils.py
index 15ca83e..c31007a 100644
--- a/src/setuptools_scm/utils.py
+++ b/src/setuptools_scm/utils.py
@@ -11,6 +11,7 @@ import os
 import io
 import platform
 import traceback
+import datetime
 
 
 DEBUG = bool(os.environ.get("SETUPTOOLS_SCM_DEBUG"))
@@ -120,6 +121,22 @@ def data_from_mime(path):
     return data
 
 
+class UTC(datetime.tzinfo):
+    _ZERO = datetime.timedelta(0)
+
+    def utcoffset(self, dt):
+        return self._ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return self._ZERO
+
+
+utc = UTC()
+
+
 def function_has_arg(fn, argname):
     assert inspect.isfunction(fn)
 
diff --git a/src/setuptools_scm/version.py b/src/setuptools_scm/version.py
index 5c6f4a6..aa4bd49 100644
--- a/src/setuptools_scm/version.py
+++ b/src/setuptools_scm/version.py
@@ -5,7 +5,7 @@ import re
 from itertools import chain, repeat, islice
 
 from .config import Configuration
-from .utils import trace, string_types
+from .utils import trace, string_types, utc
 
 from pkg_resources import iter_entry_points
 
@@ -141,7 +141,7 @@ class ScmVersion(object):
             distance = 0
         self.distance = distance
         self.node = node
-        self.time = datetime.datetime.now()
+        self.time = datetime.datetime.now(utc)
         self._extra = kw
         self.dirty = dirty
         self.preformatted = preformatted