Skip to content

Commit 7b034bf

Browse files
committed
[ENH] Replace deprecated utcnow() invocations
1 parent bcf9404 commit 7b034bf

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

conda-store-server/conda_store_server/_internal/orm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ def update_packages(self, db, subdirs=None):
716716

717717
logger.info(f"DONE for architecture : {architecture}")
718718

719-
self.last_update = datetime.datetime.utcnow()
719+
self.last_update = datetime.datetime.now(tz=datetime.timezone.utc)
720720
db.commit()
721721
logger.info("update packages DONE ")
722722

conda-store-server/conda_store_server/_internal/worker/build.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def append_to_logs(db: Session, conda_store, build, logs: typing.Union[str, byte
7474

7575
def set_build_started(db: Session, build: orm.Build):
7676
build.status = schema.BuildStatus.BUILDING
77-
build.started_on = datetime.datetime.utcnow()
77+
build.started_on = datetime.datetime.now(tz=datetime.timezone.utc)
7878
db.commit()
7979

8080

@@ -83,7 +83,7 @@ def set_build_failed(
8383
):
8484
build.status = schema.BuildStatus.FAILED
8585
build.status_info = status_info
86-
build.ended_on = datetime.datetime.utcnow()
86+
build.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
8787
db.commit()
8888

8989

@@ -92,13 +92,13 @@ def set_build_canceled(
9292
):
9393
build.status = schema.BuildStatus.CANCELED
9494
build.status_info = status_info
95-
build.ended_on = datetime.datetime.utcnow()
95+
build.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
9696
db.commit()
9797

9898

9999
def set_build_completed(db: Session, conda_store, build: orm.Build):
100100
build.status = schema.BuildStatus.COMPLETED
101-
build.ended_on = datetime.datetime.utcnow()
101+
build.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
102102

103103
directory_build_artifact = orm.BuildArtifact(
104104
build_id=build.id,
@@ -162,7 +162,10 @@ def build_cleanup(
162162
and str(build.id) not in build_active_tasks
163163
and (
164164
build.started_on
165-
< (datetime.datetime.utcnow() - datetime.timedelta(seconds=5))
165+
< (
166+
datetime.datetime.now(tz=datetime.timezone.utc)
167+
- datetime.timedelta(seconds=5)
168+
)
166169
)
167170
):
168171
conda_store.log.warning(
@@ -194,7 +197,7 @@ def build_conda_environment(db: Session, conda_store, build):
194197
db,
195198
conda_store,
196199
build,
197-
f"starting build of conda environment {datetime.datetime.utcnow()} UTC\n",
200+
f"starting build of conda environment {datetime.datetime.now(tz=datetime.timezone.utc)} UTC\n",
198201
)
199202

200203
settings = conda_store.get_settings(
@@ -337,7 +340,7 @@ def build_conda_environment(db: Session, conda_store, build):
337340

338341

339342
def solve_conda_environment(db: Session, conda_store, solve: orm.Solve):
340-
solve.started_on = datetime.datetime.utcnow()
343+
solve.started_on = datetime.datetime.now(tz=datetime.timezone.utc)
341344
db.commit()
342345

343346
_, locker = conda_store.lock_plugin()
@@ -353,7 +356,7 @@ def solve_conda_environment(db: Session, conda_store, solve: orm.Solve):
353356
solve_id=solve.id,
354357
)
355358

356-
solve.ended_on = datetime.datetime.utcnow()
359+
solve.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
357360
db.commit()
358361

359362

conda-store-server/conda_store_server/_internal/worker/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def task_delete_build(self, build_id):
297297
delete_build_artifact(db, conda_store, build_artifact)
298298

299299
# Updates build size and marks build as deleted
300-
build.deleted_on = datetime.datetime.utcnow()
300+
build.deleted_on = datetime.datetime.now(tz=datetime.timezone.utc)
301301
build.size = 0
302302

303303
db.commit()

conda-store-server/conda_store_server/conda_store.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ def delete_namespace(self, db: Session, namespace: str):
434434
if namespace is None:
435435
raise CondaStoreError(f"namespace={namespace} does not exist")
436436

437-
utcnow = datetime.datetime.utcnow()
437+
utcnow = datetime.datetime.now(tz=datetime.timezone.utc)
438438
namespace.deleted_on = utcnow
439439
for environment_orm in namespace.environments:
440440
environment_orm.deleted_on = utcnow
@@ -463,7 +463,7 @@ def delete_environment(self, db: Session, namespace: str, name: str):
463463
f"environment namespace={namespace} name={name} does not exist"
464464
)
465465

466-
utcnow = datetime.datetime.utcnow()
466+
utcnow = datetime.datetime.now(tz=datetime.timezone.utc)
467467
environment.deleted_on = utcnow
468468
for build in environment.builds:
469469
build.deleted_on = utcnow
@@ -492,7 +492,7 @@ def delete_build(self, db: Session, build_id: int):
492492
]:
493493
raise CondaStoreError("cannot delete build since not finished building")
494494

495-
build.deleted_on = datetime.datetime.utcnow()
495+
build.deleted_on = datetime.datetime.now(tz=datetime.timezone.utc)
496496
db.commit()
497497

498498
self.celery_app

conda-store-server/conda_store_server/server/auth.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,10 @@ async def post_login_method(
561561
domain=self.cookie_domain,
562562
# set cookie to expire at same time as jwt
563563
max_age=int(
564-
(authentication_token.exp - datetime.datetime.utcnow()).total_seconds()
564+
(
565+
authentication_token.exp
566+
- datetime.datetime.now(tz=datetime.timezone.utc)
567+
).total_seconds()
565568
),
566569
)
567570
return response

conda-store-server/conda_store_server/server/schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def _datetime_factory(offset: datetime.timedelta):
2929
"""Utcnow datetime + timezone as string"""
30-
return datetime.datetime.utcnow() + offset
30+
return datetime.datetime.now(tz=datetime.timezone.utc) + offset
3131

3232

3333
RoleBindings: TypeAlias = Dict[

conda-store-server/tests/conftest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ def seed_conda_store(db, conda_store):
236236

237237
# for testing purposes make build 4 complete
238238
build = api.get_build(db, build_id=4)
239-
build.started_on = datetime.datetime.utcnow()
240-
build.ended_on = datetime.datetime.utcnow()
239+
build.started_on = datetime.datetime.now(tz=datetime.timezone.utc)
240+
build.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
241241
build.status = schema.BuildStatus.COMPLETED
242242
db.commit()
243243
return db
@@ -276,8 +276,8 @@ def seed_conda_store_big(db, conda_store):
276276

277277
# for testing purposes make build 4 complete
278278
build = api.get_build(db, build_id=4)
279-
build.started_on = datetime.datetime.utcnow()
280-
build.ended_on = datetime.datetime.utcnow()
279+
build.started_on = datetime.datetime.now(tz=datetime.timezone.utc)
280+
build.ended_on = datetime.datetime.now(tz=datetime.timezone.utc)
281281
build.status = schema.BuildStatus.COMPLETED
282282
db.commit()
283283
return db

conda-store-server/tests/server/test_auth.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ def test_expired_token():
7979
token = authentication.encrypt_token(
8080
AuthenticationToken(
8181
primary_namespace="default",
82-
exp=datetime.datetime.utcnow() - datetime.timedelta(hours=1),
82+
exp=datetime.datetime.now(tz=datetime.timezone.utc)
83+
- datetime.timedelta(hours=1),
8384
role_bindings={
8485
"default/*": ["viewer"],
8586
"e*/e*": ["admin"],

0 commit comments

Comments
 (0)