Refactor deprecated datetime.utcnow()

src/dialect_map_core/controllers/base.py

@@ -3,6 +3,7 @@
 from abc import ABC
 from abc import abstractmethod
 from datetime import datetime
+from datetime import timezone
 from typing import Generic
 from typing import List
 from typing import Tuple
@@ -220,7 +221,7 @@ def archive(self, id: str) -> str:
 
         record = self.get(id)
         record.archived = True
-        record.archived_at = datetime.utcnow()
+        record.archived_at = datetime.now(timezone.utc)
 
         self.session.commit()
         return id

tests/controllers/test_category_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -59,7 +60,7 @@ def test_create(self, controller: CategoryController):
             category_id=category_id,
             description=category_ds,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(category)
@@ -80,7 +81,7 @@ def test_delete(self, controller: CategoryController):
             category_id=category_id,
             description=category_ds,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(category)

tests/controllers/test_jargon_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -83,7 +84,7 @@ def test_create(self, controller: JargonController):
             jargon_term=jargon_term,
             jargon_regex=jargon_regex,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(jargon)
@@ -110,7 +111,7 @@ def test_create_with_non_existent_jargon_group(
             jargon_term="My test jargon",
             jargon_regex="[Mm]y test jargon",
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, jargon)
@@ -129,7 +130,7 @@ def test_delete(self, controller: JargonController):
             jargon_term=jargon_term,
             jargon_regex=jargon_regex,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(jargon)
@@ -191,7 +192,7 @@ def test_create(self, controller: JargonGroupController):
             group_id=group_id,
             description=group_ds,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(group)
@@ -215,15 +216,15 @@ def test_create_nested(self, session: BaseDatabaseSession):
                 "group_id": group_id,
                 "description": "My nested group",
                 "archived": False,
-                "created_at": datetime.utcnow(),
+                "created_at": datetime.now(timezone.utc),
                 "jargons": [
                     {
                         "group_id": group_id,
                         "jargon_id": jargon_id,
                         "jargon_term": "One string",
                         "jargon_regex": "[Oo]ne string",
                         "archived": False,
-                        "created_at": datetime.utcnow(),
+                        "created_at": datetime.now(timezone.utc),
                     },
                 ],
             }
@@ -252,7 +253,7 @@ def test_delete(self, controller: JargonGroupController):
             group_id=group_id,
             description=group_ds,
             archived=False,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(group)

tests/controllers/test_membership_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -60,7 +61,7 @@ def test_create(self, controller: MembershipController):
             arxiv_id="paper-01234",
             arxiv_rev=2,
             category_id="category-01234",
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(membership)
@@ -85,7 +86,7 @@ def test_create_with_non_existent_paper(
             arxiv_id="non-existing-paper",
             arxiv_rev=100,
             category_id="category-01234",
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, membership)
@@ -106,7 +107,7 @@ def test_create_with_non_existent_category(
             arxiv_id="paper-01234",
             arxiv_rev=2,
             category_id="non-existing-category",
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, membership)
@@ -123,7 +124,7 @@ def test_delete(self, controller: MembershipController):
             arxiv_id="paper-01234",
             arxiv_rev=2,
             category_id="category-01234",
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(membership)

tests/controllers/test_metrics_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -57,7 +58,7 @@ def test_create_with_non_existent_jargon(
             category_id="category-01234",
             abs_freq=10,
             rel_freq=0.05,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, cat_metrics)
@@ -79,7 +80,7 @@ def test_create_with_non_existent_category(
             category_id="non-existing-category",
             abs_freq=10,
             rel_freq=0.05,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, cat_metrics)
@@ -143,7 +144,7 @@ def test_create_with_non_existent_jargon(
             arxiv_rev=1,
             abs_freq=10,
             rel_freq=0.05,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, paper_metrics)
@@ -166,7 +167,7 @@ def test_create_with_non_existent_category(
             arxiv_rev=1,
             abs_freq=10,
             rel_freq=0.05,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, paper_metrics)

tests/controllers/test_paper_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -54,8 +55,8 @@ def test_create(self, controller: PaperController):
             arxiv_rev=paper_rev,
             title="Test Paper",
             submission_date=datetime.today().date(),
-            created_at=datetime.utcnow(),
-            updated_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
+            updated_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(paper)
@@ -77,8 +78,8 @@ def test_delete(self, controller: PaperController):
             arxiv_rev=paper_rev,
             title="Test Paper",
             submission_date=datetime.today().date(),
-            created_at=datetime.utcnow(),
-            updated_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
+            updated_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(paper)
@@ -100,8 +101,8 @@ def test_delete_rev(self, controller: PaperController):
             arxiv_rev=paper_rev,
             title="Test Paper",
             submission_date=datetime.today().date(),
-            created_at=datetime.utcnow(),
-            updated_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
+            updated_at=datetime.now(timezone.utc),
         )
 
         controller.create(paper)
@@ -156,7 +157,7 @@ def test_create_with_non_existent_paper(
             arxiv_id="non-existing-paper",
             arxiv_rev=1,
             author_name="John Doe",
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, author)
@@ -207,7 +208,7 @@ def test_create_with_non_existent_paper(
             arxiv_rev=1,
             arxiv_ref_count=0,
             total_ref_count=0,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, counter)

tests/controllers/test_reference_ctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -84,7 +85,7 @@ def test_create(self, controller: ReferenceController):
             source_arxiv_rev=2,
             target_arxiv_id="paper-56789",
             target_arxiv_rev=2,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(ref)
@@ -110,7 +111,7 @@ def test_create_with_non_existent_source_paper(
             source_arxiv_rev=2,
             target_arxiv_id="paper-56789",
             target_arxiv_rev=2,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, ref)
@@ -132,7 +133,7 @@ def test_create_with_non_existent_target_paper(
             source_arxiv_rev=2,
             target_arxiv_id="non-existing-paper",
             target_arxiv_rev=2,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         assert pytest.raises(database.error, controller.create, ref)
@@ -150,7 +151,7 @@ def test_delete(self, controller: ReferenceController):
             source_arxiv_rev=2,
             target_arxiv_id="paper-56789",
             target_arxiv_rev=2,
-            created_at=datetime.utcnow(),
+            created_at=datetime.now(timezone.utc),
         )
 
         creation_id = controller.create(ref)

tests/storage/test_context.py

@@ -2,6 +2,7 @@
 
 from contextlib import suppress
 from datetime import datetime
+from datetime import timezone
 
 import pytest
 
@@ -71,15 +72,15 @@ def test_valid_transaction_committed(
                     category_id="example-1",
                     description="example",
                     archived=False,
-                    created_at=datetime.utcnow(),
+                    created_at=datetime.now(timezone.utc),
                 )
             )
             ctl.create(
                 Category(
                     category_id="example-2",
                     description="example",
                     archived=False,
-                    created_at=datetime.utcnow(),
+                    created_at=datetime.now(timezone.utc),
                 )
             )
 
@@ -105,15 +106,15 @@ def test_valid_transaction_uncommitted(
                     category_id="example-3",
                     description="example",
                     archived=False,
-                    created_at=datetime.utcnow(),
+                    created_at=datetime.now(timezone.utc),
                 )
             )
             ctl.create(
                 Category(
                     category_id="example-4",
                     description="example",
                     archived=False,
-                    created_at=datetime.utcnow(),
+                    created_at=datetime.now(timezone.utc),
                 )
             )