From 5bfcfbe5d627aac2b865c25d55b064364ae90ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6tsch?= Date: Tue, 31 Mar 2026 09:21:42 +0200 Subject: [PATCH] fix deprecation warnings for trixie /usr/lib/python3/dist-packages/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py:29: SyntaxWarning: invalid escape sequence '\A' "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" /usr/lib/python3/dist-packages/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py:35: SyntaxWarning: invalid escape sequence '\A' "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+[\.\-])*[a-z0-9]+\Z'::text);" /usr/lib/python3/dist-packages/serveradmin/serverdb/migrations/0018_alter_server_hostname.py:24: SyntaxWarning: invalid escape sequence '\A' "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9_]+(\.|-+))*[a-z0-9]+\Z'::text);" /usr/lib/python3/dist-packages/serveradmin/serverdb/migrations/0018_alter_server_hostname.py:30: SyntaxWarning: invalid escape sequence '\A' "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" /usr/lib/python3/dist-packages/serveradmin/serverdb/sql_generator.py:226: SyntaxWarning: invalid escape sequence '\.' "server.hostname ~ ('\\A[^\.]+\.' || regexp_replace(" /usr/lib/python3/dist-packages/serveradmin/serverdb/sql_generator.py:227: SyntaxWarning: invalid escape sequence '\*' "sub.hostname, '(\*|\-|\.)', '\\\1', 'g') || '\\Z')", --- .../serverdb/migrations/0007_hostname_regex_hyphens.py | 4 ++-- .../serverdb/migrations/0018_alter_server_hostname.py | 4 ++-- serveradmin/serverdb/sql_generator.py | 4 ++-- setup.py | 10 ++++------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py b/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py index 6b0e0d81e..72d786669 100644 --- a/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py +++ b/serveradmin/serverdb/migrations/0007_hostname_regex_hyphens.py @@ -26,13 +26,13 @@ class Migration(migrations.Migration): "ALTER TABLE server " "DROP CONSTRAINT server_hostname_check, " "ADD CONSTRAINT server_hostname_check " - "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" + r"CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" ), reverse_sql=( "ALTER TABLE server " "DROP CONSTRAINT server_hostname_check, " "ADD CONSTRAINT server_hostname_check " - "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+[\.\-])*[a-z0-9]+\Z'::text);" + r"CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+[\.\-])*[a-z0-9]+\Z'::text);" ) ), ] diff --git a/serveradmin/serverdb/migrations/0018_alter_server_hostname.py b/serveradmin/serverdb/migrations/0018_alter_server_hostname.py index bcc3aad18..3c1f115ab 100644 --- a/serveradmin/serverdb/migrations/0018_alter_server_hostname.py +++ b/serveradmin/serverdb/migrations/0018_alter_server_hostname.py @@ -21,13 +21,13 @@ class Migration(migrations.Migration): "ALTER TABLE server " "DROP CONSTRAINT server_hostname_check, " "ADD CONSTRAINT server_hostname_check " - "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9_]+(\.|-+))*[a-z0-9]+\Z'::text);" + r"CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9_]+(\.|-+))*[a-z0-9]+\Z'::text);" ), reverse_sql=( "ALTER TABLE server " "DROP CONSTRAINT server_hostname_check, " "ADD CONSTRAINT server_hostname_check " - "CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" + r"CHECK (hostname::text ~ '\A(\*\.)?([a-z0-9]+(\.|-+))*[a-z0-9]+\Z'::text);" ) ), ] diff --git a/serveradmin/serverdb/sql_generator.py b/serveradmin/serverdb/sql_generator.py index 394a17d22..ef547e167 100644 --- a/serveradmin/serverdb/sql_generator.py +++ b/serveradmin/serverdb/sql_generator.py @@ -235,8 +235,8 @@ def _condition_sql(attribute, template, related_vias): if attribute.type == 'domain': return _exists_sql(Server, 'sub', ( _target_servertype_sql('sub', attribute), - "server.hostname ~ ('\\A[^\.]+\.' || regexp_replace(" - "sub.hostname, '(\*|\-|\.)', '\\\1', 'g') || '\\Z')", + r"server.hostname ~ ('\A[^\.]+\.' || regexp_replace(" + r"sub.hostname, '(\*|\-|\.)', '\\\1', 'g') || '\Z')", template.format('sub.server_id'), )) if attribute.type == 'reverse': diff --git a/setup.py b/setup.py index ae2dab8ce..4ea22c288 100755 --- a/setup.py +++ b/setup.py @@ -56,12 +56,10 @@ 'templates/servershell/modals/*', ], }, - entry_points={ - 'console_scripts': [ - 'serveradmin=serveradmin.__main__:main', - 'adminapi=adminapi.__main__:main', - ], - }, + scripts=[ + 'bin/adminapi', + 'bin/serveradmin', + ], install_requires=[ 'paramiko>=2.7,<4', 'netaddr>=0.8.0,<1.4.0',