Use timezone-aware datetime objects, not utcnow()

reproserver/database.py

@@ -1,5 +1,5 @@
 from base64 import b64decode, b64encode
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 import os
 from sqlalchemy import Column, ForeignKey, create_engine
@@ -32,7 +32,7 @@ class Experiment(Base):
 
     hash = Column(String(64), primary_key=True)
     last_access = Column(DateTime, nullable=False,
-                         default=lambda: datetime.utcnow())
+                         default=lambda: datetime.now(timezone.utc))
     size = Column(Integer, nullable=False)
     info = Column(Text, nullable=False)
 
@@ -85,7 +85,7 @@ class Upload(Base):
     submitted_ip = Column(Text, nullable=True)
     repository_key = Column(Text, nullable=True, index=True)
     timestamp = Column(DateTime, nullable=False,
-                       default=lambda: datetime.utcnow())
+                       default=lambda: datetime.now(timezone.utc))
 
     @property
     def short_id(self):
@@ -172,7 +172,7 @@ class Run(Base):
                                            ondelete='RESTRICT'))
     upload = relationship('Upload', uselist=False)
     submitted = Column(DateTime, nullable=False,
-                       default=lambda: datetime.utcnow())
+                       default=lambda: datetime.now(timezone.utc))
     started = Column(DateTime, nullable=True)
     done = Column(DateTime, nullable=True)
 
@@ -227,7 +227,7 @@ class RunLogLine(Base):
     run_id = Column(Integer, ForeignKey('runs.id', ondelete='CASCADE'))
     run = relationship('Run', uselist=False, back_populates='log')
     timestamp = Column(DateTime, nullable=False,
-                       default=lambda: datetime.utcnow())
+                       default=lambda: datetime.now(timezone.utc))
     line = Column(Text, nullable=False)
 
     def __repr__(self):

reproserver/run/connector.py

@@ -3,7 +3,7 @@
 import hashlib
 import json
 import subprocess
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 import os
 from sqlalchemy.orm import joinedload
@@ -269,7 +269,7 @@ async def run_started(self, run_id):
         if run.started:
             logger.warning("Starting run which has already been started")
         else:
-            run.started = datetime.utcnow()
+            run.started = datetime.now(timezone.utc)
             db.commit()
 
     async def run_progress(self, run_id, percent, text):
@@ -285,13 +285,13 @@ async def run_progress(self, run_id, percent, text):
     async def run_done(self, run_id):
         db = self.DBSession()
         run = db.query(database.Run).get(run_id)
-        run.done = datetime.utcnow()
+        run.done = datetime.now(timezone.utc)
         db.commit()
 
     async def run_failed(self, run_id, error):
         db = self.DBSession()
         run = db.query(database.Run).get(run_id)
-        run.done = datetime.utcnow()
+        run.done = datetime.now(timezone.utc)
         db.add(database.RunLogLine(run_id=run.id, line=error))
         db.commit()
 
@@ -577,7 +577,7 @@ def log(self, run_id, msg, *args):
         return self.log_multiple(run_id, [line])
 
     async def log_multiple(self, run_id, lines):
-        now = datetime.utcnow().isoformat()
+        now = datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%S')
         await self.http_client.fetch(
             '{0}/runners/run/{1}/log'.format(
                 self.api_endpoint,

reproserver/web/api.py

@@ -1,5 +1,5 @@
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import functools
 import hashlib
 import logging
@@ -148,7 +148,11 @@ def post(self, run_id):
             self.db.add(database.RunLogLine(
                 run_id=run_id,
                 line=line['msg'],
-                timestamp=datetime.fromisoformat(line['time']),
+                timestamp=(
+                    datetime
+                    .fromisoformat(line['time'])
+                    .replace(tzinfo=timezone.utc)
+                ),
             ))
         self.db.commit()
         self.set_status(204)

reproserver/web/views.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from hashlib import sha256
 import json
 import logging
@@ -59,7 +59,7 @@ async def store_uploaded_rpz(
     # Check for existence of experiment
     experiment = db.query(database.Experiment).get(filehash)
     if experiment:
-        experiment.last_access = datetime.utcnow()
+        experiment.last_access = datetime.now(timezone.utc)
         logger.info("File exists in storage")
     else:
         # Insert it in database
@@ -291,10 +291,10 @@ async def get(self, repo, repo_path):
                 self.set_status(404)
                 return await self.render('setup_badfile.html', message=str(e))
         else:
-            upload.last_access = datetime.utcnow()
+            upload.last_access = datetime.now(timezone.utc)
 
         # Also updates last access
-        upload.experiment.last_access = datetime.utcnow()
+        upload.experiment.last_access = datetime.now(timezone.utc)
         self.db.commit()
 
         repo_name = get_repository_name(repo)
@@ -325,8 +325,8 @@ def get(self, upload_short_id):
             return self.render('setup_notfound.html')
 
         # Also updates last access
-        upload.last_access = datetime.utcnow()
-        upload.experiment.last_access = datetime.utcnow()
+        upload.last_access = datetime.now(timezone.utc)
+        upload.experiment.last_access = datetime.now(timezone.utc)
         self.db.commit()
 
         return self.reproduce(upload)
@@ -358,8 +358,8 @@ async def post(self, upload_short_id):
         experiment = upload.experiment
 
         # Update last access
-        upload.last_access = datetime.utcnow()
-        upload.experiment.last_access = datetime.utcnow()
+        upload.last_access = datetime.now(timezone.utc)
+        upload.experiment.last_access = datetime.now(timezone.utc)
 
         # New run entry
         run = database.Run(experiment_hash=experiment.hash,
@@ -492,7 +492,7 @@ def get(self, run_short_id):
             for extension in run.experiment.extensions
         }
         # Update last access
-        run.experiment.last_access = datetime.utcnow()
+        run.experiment.last_access = datetime.now(timezone.utc)
         self.db.commit()
 
         def get_port_url(port_number):

reproserver/web/webcapture.py

@@ -1,5 +1,5 @@
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 import logging
 import os
@@ -187,8 +187,8 @@ def post(self, upload_short_id):
         experiment = upload.experiment
 
         # Update last access
-        upload.last_access = datetime.utcnow()
-        upload.experiment.last_access = datetime.utcnow()
+        upload.last_access = datetime.now(timezone.utc)
+        upload.experiment.last_access = datetime.now(timezone.utc)
 
         # New run entry
         run = database.Run(experiment_hash=experiment.hash,
@@ -250,8 +250,8 @@ def post(self, upload_short_id):
         experiment = upload.experiment
 
         # Update last access
-        upload.last_access = datetime.utcnow()
-        upload.experiment.last_access = datetime.utcnow()
+        upload.last_access = datetime.now(timezone.utc)
+        upload.experiment.last_access = datetime.now(timezone.utc)
 
         # New run entry
         run = database.Run(experiment_hash=experiment.hash,
@@ -404,8 +404,8 @@ def post(self, upload_short_id):
         experiment = upload.experiment
 
         # Update last access
-        upload.last_access = datetime.utcnow()
-        upload.experiment.last_access = datetime.utcnow()
+        upload.last_access = datetime.now(timezone.utc)
+        upload.experiment.last_access = datetime.now(timezone.utc)
 
         # New run entry
         run = database.Run(experiment_hash=experiment.hash,