refactor(commands): move return codes to top level

thekaveman · thekaveman · commit 85cb99a5741b · 2024-04-19T13:12:31.000-07:00
make more easily accessible elsewhere
diff --git a/compiler_admin/__init__.py b/compiler_admin/__init__.py
@@ -1,5 +1,8 @@
 from importlib.metadata import version, PackageNotFoundError
 
+RESULT_SUCCESS = 0
+RESULT_FAILURE = 1
+
 try:
     __version__ = version("compiler_admin")
 except PackageNotFoundError:
diff --git a/compiler_admin/commands/__init__.py b/compiler_admin/commands/__init__.py
@@ -1,2 +0,0 @@
-RESULT_SUCCESS = 0
-RESULT_FAILURE = 1
diff --git a/compiler_admin/commands/convert.py b/compiler_admin/commands/convert.py
@@ -1,6 +1,6 @@
 from argparse import Namespace
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import (
     GROUP_PARTNERS,
     GROUP_STAFF,
diff --git a/compiler_admin/commands/create.py b/compiler_admin/commands/create.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 from typing import Sequence
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import GROUP_TEAM, add_user_to_group, CallGAMCommand, user_account_name, user_exists
 
 
diff --git a/compiler_admin/commands/delete.py b/compiler_admin/commands/delete.py
@@ -1,6 +1,6 @@
 from argparse import Namespace
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import CallGAMCommand, user_account_name, user_exists
 
 
diff --git a/compiler_admin/commands/info.py b/compiler_admin/commands/info.py
@@ -1,5 +1,4 @@
-from compiler_admin import __version__ as version
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import __version__ as version, RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import CallGAMCommand, CallGYBCommand
 
 
diff --git a/compiler_admin/commands/init.py b/compiler_admin/commands/init.py
@@ -4,7 +4,7 @@
 from shutil import rmtree
 import subprocess
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.services.google import USER_ARCHIVE, CallGAMCommand
 
 
diff --git a/compiler_admin/commands/offboard.py b/compiler_admin/commands/offboard.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 from tempfile import NamedTemporaryFile
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.commands.delete import delete
 from compiler_admin.commands.signout import signout
 from compiler_admin.services.google import (
diff --git a/compiler_admin/commands/reset_password.py b/compiler_admin/commands/reset_password.py
@@ -1,6 +1,6 @@
 from argparse import Namespace
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.commands.signout import signout
 from compiler_admin.services.google import USER_HELLO, CallGAMCommand, user_account_name, user_exists
 
diff --git a/compiler_admin/commands/restore.py b/compiler_admin/commands/restore.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pathlib
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import USER_ARCHIVE, CallGYBCommand, user_account_name
 
 
diff --git a/compiler_admin/commands/signout.py b/compiler_admin/commands/signout.py
@@ -1,6 +1,6 @@
 from argparse import Namespace
 
-from compiler_admin.commands import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
 from compiler_admin.services.google import CallGAMCommand, user_account_name, user_exists
 
 
diff --git a/tests/commands/test_convert.py b/tests/commands/test_convert.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.convert import convert, __name__ as MODULE
 
 
diff --git a/tests/commands/test_create.py b/tests/commands/test_create.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.create import create, __name__ as MODULE
 from compiler_admin.services.google import USER_HELLO
 
diff --git a/tests/commands/test_delete.py b/tests/commands/test_delete.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.delete import delete, __name__ as MODULE
 
 
diff --git a/tests/commands/test_info.py b/tests/commands/test_info.py
@@ -1,7 +1,6 @@
 import pytest
 
-from compiler_admin import __version__ as version
-from compiler_admin.commands import RESULT_SUCCESS
+from compiler_admin import __version__ as version, RESULT_SUCCESS
 from compiler_admin.commands.info import info, __name__ as MODULE
 from compiler_admin.services.google import DOMAIN
 
diff --git a/tests/commands/test_offboard.py b/tests/commands/test_offboard.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.offboard import offboard, __name__ as MODULE
 
 
diff --git a/tests/commands/test_reset_password.py b/tests/commands/test_reset_password.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.reset_password import reset_password, __name__ as MODULE
 from compiler_admin.services.google import USER_HELLO
 
diff --git a/tests/commands/test_restore.py b/tests/commands/test_restore.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
 
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.restore import restore, __name__ as MODULE
 
 
diff --git a/tests/commands/test_signout.py b/tests/commands/test_signout.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 import pytest
 
-from compiler_admin.commands import RESULT_FAILURE, RESULT_SUCCESS
+from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
 from compiler_admin.commands.signout import signout, __name__ as MODULE
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from compiler_admin.commands import RESULT_SUCCESS
+from compiler_admin import RESULT_SUCCESS
 
 
 @pytest.fixture

Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-RESULT_SUCCESS = 0`
`2`		`-RESULT_FAILURE = 1`