This is an automated email from the ASF dual-hosted git repository. arm pushed a commit to branch arm in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
commit 7a828f68d4572adc4f6528bc7c39cabffc4495e3 Author: Alastair McFarlane <[email protected]> AuthorDate: Tue Feb 24 09:54:47 2026 +0000 #695 - remove SVN Relase from SVN form. Also add support for Njord bundle as a filetype and project property for file tagging spec --- atr/analysis.py | 1 + atr/models/sql.py | 6 ++++++ atr/post/upload.py | 2 +- atr/shared/upload.py | 10 +++++----- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/atr/analysis.py b/atr/analysis.py index 4b617d1b..2502e8db 100755 --- a/atr/analysis.py +++ b/atr/analysis.py @@ -38,6 +38,7 @@ ARTIFACT_SUFFIXES: Final[list[str]] = [ "msi", "nar", "nbm", + "ntb", "snupkg", "nupkg", "pkg", diff --git a/atr/models/sql.py b/atr/models/sql.py index 931c1be2..1435a986 100644 --- a/atr/models/sql.py +++ b/atr/models/sql.py @@ -774,6 +774,12 @@ Thanks, return False return policy.strict_checking + @property + def policy_tagging_spec(self) -> dict[str, Any] | None: + if (policy := self.release_policy) is None: + return None + return policy.file_tag_mappings + @property def policy_github_repository_name(self) -> str: if (policy := self.release_policy) is None: diff --git a/atr/post/upload.py b/atr/post/upload.py index 9d6edf42..bee8a30e 100644 --- a/atr/post/upload.py +++ b/atr/post/upload.py @@ -215,7 +215,7 @@ async def _svn_import( ) -> web.WerkzeugResponse: try: target_subdirectory = str(svn_form.target_subdirectory) if svn_form.target_subdirectory else None - svn_area = svn_form.svn_area + svn_area = shared.upload.SvnArea.DEV svn_path = svn_form.svn_path or "" async with db.session() as data: diff --git a/atr/shared/upload.py b/atr/shared/upload.py index cb7dabdf..033c97f6 100644 --- a/atr/shared/upload.py +++ b/atr/shared/upload.py @@ -56,11 +56,11 @@ class AddFilesForm(form.Form): class SvnImportForm(form.Form): variant: SVN_IMPORT = form.value(SVN_IMPORT) - svn_area: form.Enum[SvnArea] = form.label( - "svn:dist area", - "Select whether to import from dev or release.", - widget=form.Widget.RADIO, - ) + # svn_area: form.Enum[SvnArea] = form.label( + # "svn:dist area", + # "Select whether to import from dev or release.", + # widget=form.Widget.RADIO, + # ) svn_path: form.URLPath = form.label( "SVN path", "Path within the committee's svn:dist directory, e.g. 'java-library/4_0_4' or '3.1.5rc1'.", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
