Merge pull request asdf-format#1641 from braingram/py312

Add support for python 3.12
braingram · Sep 11, 2023 · 4f6ebef · 4f6ebef
1 parent 932b909
commit 4f6ebef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,11 @@
+2.15.2 (unreleased)
+-------------------
+
+The ASDF Standard is at v1.6.0
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Add support for python 3.12 [#1641]
+
 2.15.1 (2023-08-07)
 -------------------
 

diff --git a/asdf/asdf.py b/asdf/asdf.py
@@ -1590,8 +1590,8 @@ def add_history_entry(self, description, software=None):
         elif software is not None:
             software = Software(software)
 
-        time_ = datetime.datetime.utcfromtimestamp(
-            int(os.environ.get("SOURCE_DATE_EPOCH", time.time())),
+        time_ = datetime.datetime.fromtimestamp(
+            int(os.environ.get("SOURCE_DATE_EPOCH", time.time())), datetime.timezone.utc
         )
 
         entry = HistoryEntry(

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,6 +13,7 @@ classifiers = [
   'Programming Language :: Python :: 3.9',
   'Programming Language :: Python :: 3.10',
   'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12',
 ]
 dynamic = [
   'version',