Run "pyupgrade --py311-plus --keep-runtime-typing" over all code

dandiapi/analytics/tasks/__init__.py

@@ -1,6 +1,6 @@
 from collections import Counter
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
 
 from celery.app import shared_task
 from celery.utils.log import get_task_logger
@@ -79,7 +79,7 @@ def process_s3_log_file_task(bucket: LogBucket, s3_log_key: str) -> None:
     download_counts = Counter()
 
     for log_entry in s3logparse.parse_log_lines(
-        (line.decode('utf8') for line in data['Body'].iter_lines())
+        line.decode('utf8') for line in data['Body'].iter_lines()
     ):
         if log_entry.operation == 'REST.GET.OBJECT' and log_entry.status_code == 200:
             download_counts.update({log_entry.s3_key: 1})

dandiapi/api/models/asset.py

@@ -302,7 +302,7 @@ def full_metadata(self):
 
     def published_metadata(self):
         """Generate the metadata of this asset as if it were being published."""
-        now = datetime.datetime.now(datetime.timezone.utc)
+        now = datetime.datetime.now(datetime.UTC)
         # Inject the publishedBy and datePublished fields
         return {
             **self.full_metadata,

dandiapi/api/models/version.py

@@ -118,7 +118,7 @@ def datetime_to_version(time: datetime.datetime) -> str:
 
     @classmethod
     def next_published_version(cls, dandiset: Dandiset) -> str:
-        time = datetime.datetime.now(datetime.timezone.utc)
+        time = datetime.datetime.now(datetime.UTC)
         # increment time until there are no collisions
         while True:
             version = cls.datetime_to_version(time)

dandiapi/api/services/metadata/__init__.py

@@ -79,12 +79,10 @@ def version_aggregate_assets_summary(version: Version) -> None:
         raise VersionHasBeenPublished()
 
     version.metadata['assetsSummary'] = aggregate_assets_summary(
-        (
-            asset.full_metadata
-            for asset in version.assets.filter(status=Asset.Status.VALID)
-            .select_related('blob', 'zarr')
-            .iterator()
-        )
+        asset.full_metadata
+        for asset in version.assets.filter(status=Asset.Status.VALID)
+        .select_related('blob', 'zarr')
+        .iterator()
     )
 
     Version.objects.filter(id=version.id, version='draft').update(

dandiapi/api/services/publish/__init__.py

@@ -85,7 +85,7 @@ def _build_publishable_version_from_draft(draft_version: Version) -> Version:
         version=Version.next_published_version(draft_version.dandiset),
     )
 
-    now = datetime.datetime.now(datetime.timezone.utc)
+    now = datetime.datetime.now(datetime.UTC)
     # inject the publishedBy and datePublished fields
     publishable_version.metadata.update(
         {

dandiapi/api/tasks/scheduled.py

@@ -3,9 +3,9 @@
 
 This module is imported from celery.py in a post-app-load hook.
 """
+from collections.abc import Iterable
 from datetime import timedelta
 import time
-from typing import Iterable
 
 from celery import shared_task
 from celery.app.base import Celery

dandiapi/api/tests/factories.py

@@ -124,7 +124,7 @@ class Meta:
     def _create(cls, *args, **kwargs):
         version: Version = super()._create(*args, **kwargs)
         version.doi = f'10.80507/dandi.{version.dandiset.identifier}/{version.version}'
-        now = datetime.datetime.now(datetime.timezone.utc)
+        now = datetime.datetime.now(datetime.UTC)
         version.metadata = {
             **version.metadata,
             'publishedBy': version.published_by(now),

dandiapi/api/tests/test_tasks.py

@@ -170,7 +170,7 @@ def test_validate_asset_metadata_saves_version(draft_asset: Asset, draft_version
     draft_version.assets.add(draft_asset)
 
     # Update version with queryset so modified isn't auto incremented
-    old_datetime = datetime.datetime.fromtimestamp(1573782390).astimezone(datetime.timezone.utc)
+    old_datetime = datetime.datetime.fromtimestamp(1573782390).astimezone(datetime.UTC)
     Version.objects.filter(id=draft_version.id).update(modified=old_datetime)
 
     # Run task