Skip to content

Commit 2e23b04

Browse files
authored
Fix deprecation warnings related to datetime.utcnow (#1912)
`utcnow` is deprecated in python 3.12 in favor of `now(UTC)`.
1 parent d27d665 commit 2e23b04

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

api/src/shipit_api/admin/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def update_release_status(name, body):
243243
status = body["status"]
244244
release.status = status
245245
if status == "shipped":
246-
release.completed = datetime.datetime.utcnow()
246+
release.completed = datetime.datetime.now(datetime.UTC)
247247
session.commit()
248248

249249
logger.info("Status of %s changed to %s", release.name, status)
@@ -283,7 +283,7 @@ def phase_signoff(name, phase, body):
283283
if not set(users_ldap).intersection(set(ldap_group)):
284284
abort(401, f"User `{users_email}` is not in the `{signoff.permissions}`")
285285

286-
signoff.completed = datetime.datetime.utcnow()
286+
signoff.completed = datetime.datetime.now(datetime.UTC)
287287
signoff.signed = True
288288
signoff.completed_by = users_email
289289

api/src/shipit_api/admin/xpi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def phase_signoff(name, phase, body):
176176
if not set(users_ldap).intersection(set(ldap_group)) and not XPI_LAX_SIGN_OFF:
177177
abort(401, f"User `{users_email}` is not in the `{signoff.permissions}`")
178178

179-
signoff.completed = datetime.datetime.utcnow()
179+
signoff.completed = datetime.datetime.now(datetime.UTC)
180180
signoff.signed = True
181181
signoff.completed_by = users_email
182182

api/src/shipit_api/common/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Phase(db.Model, PhaseBase):
9090
task_id = sa.Column(sa.String, nullable=False)
9191
task = sa.Column(sa.Text, nullable=False)
9292
context = sa.Column(sa.Text, nullable=False)
93-
created = sa.Column(sa.DateTime, default=datetime.datetime.utcnow)
93+
created = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.UTC))
9494
scheduled_at = sa.Column(sa.DateTime)
9595
scheduled_by = sa.Column(sa.String)
9696
release_id = sa.Column(sa.Integer, sa.ForeignKey("shipit_api_releases.id"))
@@ -139,7 +139,7 @@ class Release(db.Model, ReleaseBase):
139139
release_eta = sa.Column(sa.DateTime)
140140
status = sa.Column(sa.String) # TODO: move to Enum: shipped, abandoned, scheduled
141141
phases = sqlalchemy.orm.relationship("Phase", order_by=Phase.id, back_populates="release", lazy="selectin")
142-
created = sa.Column(sa.DateTime, default=datetime.datetime.utcnow)
142+
created = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.UTC))
143143
completed = sa.Column(sa.DateTime)
144144

145145
phase_class = Phase
@@ -259,7 +259,7 @@ class XPIPhase(db.Model, PhaseBase):
259259
task_id = sa.Column(sa.String, nullable=False)
260260
task = sa.Column(sa.Text, nullable=False)
261261
context = sa.Column(sa.Text, nullable=False)
262-
created = sa.Column(sa.DateTime, default=datetime.datetime.utcnow)
262+
created = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.UTC))
263263
scheduled_at = sa.Column(sa.DateTime)
264264
scheduled_by = sa.Column(sa.String)
265265
release_id = sa.Column(sa.Integer, sa.ForeignKey("shipit_api_xpi_releases.id"))
@@ -279,7 +279,7 @@ class XPIRelease(db.Model, ReleaseBase):
279279
revision = sa.Column(sa.String, nullable=False)
280280
status = sa.Column(sa.String)
281281
phases = sqlalchemy.orm.relationship("XPIPhase", order_by=XPIPhase.id, back_populates="release", lazy="selectin")
282-
created = sa.Column(sa.DateTime, default=datetime.datetime.utcnow)
282+
created = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.UTC))
283283
completed = sa.Column(sa.DateTime)
284284

285285
phase_class = XPIPhase

0 commit comments

Comments
 (0)