You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by tn...@apache.org on 2025/03/21 08:29:34 UTC
(tooling-trusted-release) 02/02: fix: apply missing pre-commit fixes
This is an automated email from the ASF dual-hosted git repository.
tn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
commit ec38e1353671caffd746a56da0ac07d55dee15d3
Author: Thomas Neidhart <tn...@apache.org>
AuthorDate: Fri Mar 21 09:29:17 2025 +0100
fix: apply missing pre-commit fixes
---
atr/blueprints/admin/__init__.py | 4 ++--
atr/db/__init__.py | 5 +++++
atr/routes/candidate.py | 8 ++++----
atr/routes/dev.py | 4 ++--
atr/routes/docs.py | 4 ++--
atr/routes/download.py | 6 +++---
atr/routes/keys.py | 8 ++++----
atr/routes/package.py | 6 +++---
atr/routes/projects.py | 6 +++---
atr/routes/release.py | 6 +++---
atr/routes/vote_policy.py | 4 ++--
atr/server.py | 8 ++++----
12 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/atr/blueprints/admin/__init__.py b/atr/blueprints/admin/__init__.py
index ae91fdc..6b4371c 100644
--- a/atr/blueprints/admin/__init__.py
+++ b/atr/blueprints/admin/__init__.py
@@ -19,11 +19,11 @@
from typing import Final
-import quart
-
import asfquart.auth as auth
import asfquart.base as base
import asfquart.session as session
+import quart
+
import atr.util as util
BLUEPRINT: Final = quart.Blueprint("admin", __name__, url_prefix="/admin", template_folder="templates")
diff --git a/atr/db/__init__.py b/atr/db/__init__.py
index cf3f39f..c3c3389 100644
--- a/atr/db/__init__.py
+++ b/atr/db/__init__.py
@@ -38,6 +38,7 @@ if TYPE_CHECKING:
from datetime import datetime
import asfquart.base as base
+
from atr.db.models import ReleasePhase, ReleaseStage, TaskStatus, VoteEntry
_LOGGER: Final = logging.getLogger(__name__)
@@ -90,6 +91,10 @@ class Query(Generic[T]):
self.query = query
self.session = session
+ def order_by(self, *args: Any, **kwargs: Any) -> Query[T]:
+ self.query = self.query.order_by(*args, **kwargs)
+ return self
+
async def get(self) -> T | None:
result = await self.session.execute(self.query)
return result.scalar_one_or_none()
diff --git a/atr/routes/candidate.py b/atr/routes/candidate.py
index 90dd49d..0e7cc5b 100644
--- a/atr/routes/candidate.py
+++ b/atr/routes/candidate.py
@@ -19,14 +19,14 @@
import datetime
-import quart
-import werkzeug.wrappers.response as response
-import wtforms
-
import asfquart
import asfquart.auth as auth
import asfquart.base as base
import asfquart.session as session
+import quart
+import werkzeug.wrappers.response as response
+import wtforms
+
import atr.db as db
import atr.db.models as models
import atr.routes as routes
diff --git a/atr/routes/dev.py b/atr/routes/dev.py
index 765370d..597507b 100644
--- a/atr/routes/dev.py
+++ b/atr/routes/dev.py
@@ -16,12 +16,12 @@
# under the License.
-import quart
-
import asfquart as asfquart
import asfquart.auth as auth
import asfquart.base as base
import asfquart.session as session
+import quart
+
import atr.db as db
import atr.db.models as models
import atr.routes as routes
diff --git a/atr/routes/docs.py b/atr/routes/docs.py
index 5d350a1..c4fb156 100644
--- a/atr/routes/docs.py
+++ b/atr/routes/docs.py
@@ -17,10 +17,10 @@
"""docs.py"""
-import quart
-
import asfquart as asfquart
import asfquart.auth as auth
+import quart
+
import atr.routes as routes
diff --git a/atr/routes/download.py b/atr/routes/download.py
index 6ff0dbf..037498a 100644
--- a/atr/routes/download.py
+++ b/atr/routes/download.py
@@ -21,12 +21,12 @@ import pathlib
import aiofiles
import aiofiles.os
-import quart
-import werkzeug.wrappers.response as response
-
import asfquart.auth as auth
import asfquart.base as base
import asfquart.session as session
+import quart
+import werkzeug.wrappers.response as response
+
import atr.db as db
import atr.routes as routes
import atr.util as util
diff --git a/atr/routes/keys.py b/atr/routes/keys.py
index 04930f8..6377708 100644
--- a/atr/routes/keys.py
+++ b/atr/routes/keys.py
@@ -29,16 +29,16 @@ import shutil
import tempfile
from collections.abc import AsyncGenerator, Sequence
+import asfquart as asfquart
+import asfquart.auth as auth
+import asfquart.base as base
+import asfquart.session as session
import cryptography.hazmat.primitives.serialization as serialization
import gnupg
import quart
import werkzeug.wrappers.response as response
import wtforms
-import asfquart as asfquart
-import asfquart.auth as auth
-import asfquart.base as base
-import asfquart.session as session
import atr.db as db
import atr.db.models as models
import atr.routes as routes
diff --git a/atr/routes/package.py b/atr/routes/package.py
index 38314f3..3633c54 100644
--- a/atr/routes/package.py
+++ b/atr/routes/package.py
@@ -28,13 +28,13 @@ from collections.abc import Sequence
import aiofiles
import aiofiles.os
+import asfquart.auth as auth
+import asfquart.base as base
+import asfquart.session as session
import quart
import werkzeug.datastructures as datastructures
import werkzeug.wrappers.response as response
-import asfquart.auth as auth
-import asfquart.base as base
-import asfquart.session as session
import atr.db as db
import atr.db.models as models
import atr.routes as routes
diff --git a/atr/routes/projects.py b/atr/routes/projects.py
index 72bf39d..07b369d 100644
--- a/atr/routes/projects.py
+++ b/atr/routes/projects.py
@@ -19,12 +19,12 @@
import http.client
+import asfquart.base as base
+import asfquart.session as session
import quart
import werkzeug.wrappers.response as response
import wtforms
-import asfquart.base as base
-import asfquart.session as session
import atr.db as db
import atr.db.models as models
import atr.routes as routes
@@ -81,7 +81,7 @@ async def add_voting_policy(session: session.ClientSession, form: CreateVotePoli
async def root_project_directory() -> str:
"""Main project directory page."""
async with db.session() as data:
- projects = await data.project(_committee=True).all()
+ projects = await data.project(_committee=True).order_by(models.Project.name).all()
return await quart.render_template("project-directory.html", projects=projects)
diff --git a/atr/routes/release.py b/atr/routes/release.py
index fbc8557..ebb320e 100644
--- a/atr/routes/release.py
+++ b/atr/routes/release.py
@@ -21,13 +21,13 @@ import logging
import logging.handlers
import pathlib
-import quart
-import werkzeug.wrappers.response as response
-
import asfquart
import asfquart.auth as auth
import asfquart.base as base
import asfquart.session as session
+import quart
+import werkzeug.wrappers.response as response
+
import atr.db as db
import atr.db.models as models
import atr.db.service as service
diff --git a/atr/routes/vote_policy.py b/atr/routes/vote_policy.py
index f447235..8d30d5c 100644
--- a/atr/routes/vote_policy.py
+++ b/atr/routes/vote_policy.py
@@ -17,12 +17,12 @@
"""vote_policy.py"""
+import asfquart.base as base
+import asfquart.session as session
import quart
import werkzeug.wrappers.response as response
import wtforms
-import asfquart.base as base
-import asfquart.session as session
import atr.db as db
import atr.routes as routes
import atr.util as util
diff --git a/atr/server.py b/atr/server.py
index 7efc8a0..ea3b6bc 100644
--- a/atr/server.py
+++ b/atr/server.py
@@ -22,15 +22,15 @@ import os
from collections.abc import Iterable
from typing import Any
+import asfquart
+import asfquart.base as base
+import asfquart.generics
+import asfquart.session
import blockbuster
import quart
import quart_schema
import werkzeug.routing as routing
-import asfquart
-import asfquart.base as base
-import asfquart.generics
-import asfquart.session
import atr.blueprints as blueprints
import atr.config as config
import atr.db as db
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org