Merge pull request #311 from QuantumDancer/update-pyauditor-v0.2.0

Update pyauditor to 0.2.0
MatterMiners · Sep 28, 2023 · 886255e · 886255e
2 parents 24cdb48 + 755c901
commit 886255e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -92,8 +92,7 @@ def get_cryptography_version():
         "pydantic<2.0.0",
         "asyncstdlib",
         "typing_extensions",
-        "python-auditor==0.1.0",
-        "pytz",
+        "python-auditor==0.2.0",
         "tzlocal",
         *REST_REQUIRES,
     ],

diff --git a/tardis/plugins/auditor.py b/tardis/plugins/auditor.py
@@ -6,8 +6,8 @@
 
 import pyauditor
 
+import datetime
 import logging
-import pytz
 from tzlocal import get_localzone
 
 
@@ -83,13 +83,13 @@ async def notify(self, state: State, resource_attributes: AttributeDict) -> None
             record.with_stop_time(
                 resource_attributes["updated"]
                 .replace(tzinfo=self._local_timezone)
-                .astimezone(pytz.utc)
+                .astimezone(datetime.timezone.utc)
             )
             try:
                 await self._client.update(record)
             except RuntimeError as e:
                 if str(e).startswith(
-                    "Reqwest Error: HTTP status client error (400 Bad Request)"
+                    "Reqwest Error: HTTP status client error (404 Not Found)"
                 ):
                     self.logger.debug(
                         f"Could not update record {record.record_id}, "
@@ -117,7 +117,7 @@ def construct_record(self, resource_attributes: AttributeDict):
             resource_attributes["drone_uuid"],
             resource_attributes["updated"]
             .replace(tzinfo=self._local_timezone)
-            .astimezone(pytz.utc),
+            .astimezone(datetime.timezone.utc),
         ).with_meta(meta)
 
         for resource, amount in self._resources[resource_attributes["site_name"]][

diff --git a/tests/plugins_t/test_auditor.py b/tests/plugins_t/test_auditor.py
@@ -145,7 +145,7 @@ def test_notify(self):
 
         # test exception handling
         self.client.update.side_effect = RuntimeError(
-            "Reqwest Error: HTTP status client error (400 Bad Request) "
+            "Reqwest Error: HTTP status client error (404 Not Found) "
             "for url (http://127.0.0.1:8000/update)"
         )
         run_async(