Added colab-admin as cli entry-point

Sergio Oliveira
1 parent 8f2fec4b
Showing 3 changed files with 17 additions and 11 deletions Show diff stats
colab/management/__init__.py
scripts/colab-admin
setup.py
@@ -0,0 +1,14 @@
+
+import os
+from django.core.management import ManagementUtility
+
+
+def execute_from_command_line(argv=None):
+    """
+    A simple method that runs a ManagementUtility.
+    """
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "colab.settings")
+    os.environ.setdefault("COLAB_SETTINGS", "/etc/colab/settings.yaml")
+
+    utility = ManagementUtility(argv)
+    utility.execute()
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "colab.settings")
-    os.environ.setdefault("COLAB_SETTINGS", "/etc/colab/settings.yaml")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)
@@ -19,6 +19,9 @@ setup(
     license='LICENSE.txt',
     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
     include_package_data=True,
+    entry_points={'console_scripts': [
+        'colab-admin = colab.management:execute_from_command_line',
+    ]},
     zip_safe=False,
     long_description=open('README.rst').read(),
     install_requires=reqs,
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+
	2	+import os
	3	+from django.core.management import ManagementUtility
	4	+
	5	+
	6	+def execute_from_command_line(argv=None):
	7	+ """
	8	+ A simple method that runs a ManagementUtility.
	9	+ """
	10	+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "colab.settings")
	11	+ os.environ.setdefault("COLAB_SETTINGS", "/etc/colab/settings.yaml")
	12	+
	13	+ utility = ManagementUtility(argv)
	14	+ utility.execute()
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-#!/usr/bin/env python
2	-import os
3	-import sys
4	-
5	-if __name__ == "__main__":
6	- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "colab.settings")
7	- os.environ.setdefault("COLAB_SETTINGS", "/etc/colab/settings.yaml")
8	-
9	- from django.core.management import execute_from_command_line
10	-
11	- execute_from_command_line(sys.argv)
	@@ -19,6 +19,9 @@ setup(		@@ -19,6 +19,9 @@ setup(
19	license='LICENSE.txt',	19	license='LICENSE.txt',
20	packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),	20	packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
21	include_package_data=True,	21	include_package_data=True,
		22	+ entry_points={'console_scripts': [
		23	+ 'colab-admin = colab.management:execute_from_command_line',
		24	+ ]},
22	zip_safe=False,	25	zip_safe=False,
23	long_description=open('README.rst').read(),	26	long_description=open('README.rst').read(),
24	install_requires=reqs,	27	install_requires=reqs,