1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 23 Feb 2022 14:40:11 +0100
Subject: [PATCH] Expose setup.py as pgadmin4-setup
---
pkg/pip/setup_pip.py | 5 ++++-
web/setup.py | 14 ++++++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py
index 5592d1b04..131eaa1ed 100644
--- a/pkg/pip/setup_pip.py
+++ b/pkg/pip/setup_pip.py
@@ -95,7 +95,10 @@ setup(
},
entry_points={
- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'],
+ 'console_scripts': [
+ 'pgadmin4=pgadmin4.pgAdmin4:main',
+ 'pgadmin4-setup=pgadmin4.setup:main'
+ ],
},
)
diff --git a/web/setup.py b/web/setup.py
index 5f4257e86..df970f049 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -32,6 +32,10 @@ from pgadmin import create_app
from pgadmin.utils import clear_database_servers, dump_database_servers,\
load_database_servers
+# Configuration settings
+import config
+from pgadmin.model import SCHEMA_VERSION
+from pgadmin.setup import db_upgrade, create_app_data_directory
def dump_servers(args):
"""Dump the server groups and servers.
@@ -139,12 +143,7 @@ def clear_servers():
clear_database_servers(load_user, True)
-if __name__ == '__main__':
- # Configuration settings
- import config
- from pgadmin.model import SCHEMA_VERSION
- from pgadmin.setup import db_upgrade, create_app_data_directory
-
+def main():
parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
exp_group = parser.add_argument_group('Dump server config')
@@ -194,3 +193,6 @@ if __name__ == '__main__':
print(str(e))
else:
setup_db()
+
+if __name__ == '__main__':
+ main()
--
2.35.1
|