Rename init_command.py -> init.py (consistency)

Signed-off-by: Fabrice Normandin <normandf@mila.quebec>
mila-iqia · Apr 18, 2024 · 1d8ea61 · 1d8ea61
1 parent ff02514
commit 1d8ea61
Show file tree

Hide file tree

Showing 54 changed files with 22 additions and 22 deletions.
diff --git a/milatools/cli/commands.py b/milatools/cli/commands.py
@@ -32,7 +32,7 @@
 from ..utils.remote_v1 import RemoteV1
 from .code_command import add_mila_code_arguments
 from .common import forward, standard_server
-from .init_command import (
+from .init import (
     print_welcome_message,
     setup_keys_on_login_node,
     setup_passwordless_ssh_access,

diff --git a/milatools/cli/init_command.py → milatools/cli/init.py b/milatools/cli/init_command.py → milatools/cli/init.py
diff --git a/milatools/utils/compute_node.py b/milatools/utils/compute_node.py
@@ -13,7 +13,7 @@
 import warnings
 
 from milatools.cli import console
-from milatools.cli.init_command import DRAC_CLUSTERS
+from milatools.cli.init import DRAC_CLUSTERS
 from milatools.cli.utils import get_hostname_to_use_for_compute_node
 from milatools.utils.remote_v1 import Hide
 from milatools.utils.remote_v2 import RemoteV2, logger, ssh_command

diff --git a/tests/cli/test_init_command.py → tests/cli/test_init.py b/tests/cli/test_init_command.py → tests/cli/test_init.py
@@ -22,8 +22,8 @@
 from prompt_toolkit.input import PipeInput, create_pipe_input
 from pytest_regressions.file_regression import FileRegressionFixture
 
-from milatools.cli import init_command
-from milatools.cli.init_command import (
+from milatools.cli import init
+from milatools.cli.init import (
     DRAC_CLUSTERS,
     _get_drac_username,
     _get_mila_username,
@@ -845,12 +845,12 @@ def test_setup_windows_ssh_config_from_wsl(
     windows_ssh_config_path = windows_home / ".ssh" / "config"
 
     monkeypatch.setattr(
-        init_command,
+        init,
         running_inside_WSL.__name__,
         Mock(spec=running_inside_WSL, return_value=True),
     )
     monkeypatch.setattr(
-        init_command,
+        init,
         get_windows_home_path_in_wsl.__name__,
         Mock(spec=get_windows_home_path_in_wsl, return_value=windows_home),
     )
@@ -921,15 +921,15 @@ def test_setup_vscode_settings(
             json.dump(initial_settings, f, indent=4)
 
     monkeypatch.setattr(
-        init_command,
-        init_command.vscode_installed.__name__,
-        Mock(spec=init_command.vscode_installed, return_value=True),
+        init,
+        init.vscode_installed.__name__,
+        Mock(spec=init.vscode_installed, return_value=True),
     )
     monkeypatch.setattr(
-        init_command,
-        init_command.get_expected_vscode_settings_json_path.__name__,
+        init,
+        init.get_expected_vscode_settings_json_path.__name__,
         Mock(
-            spec=init_command.get_expected_vscode_settings_json_path,
+            spec=init.get_expected_vscode_settings_json_path,
             return_value=vscode_settings_json_path,
         ),
     )
@@ -1005,12 +1005,12 @@ def test_setup_windows_ssh_config_from_wsl_copies_keys(
     monkeypatch.setattr(Path, "home", Mock(spec=Path.home, return_value=linux_home))
 
     monkeypatch.setattr(
-        init_command,
+        init,
         running_inside_WSL.__name__,
         Mock(spec=running_inside_WSL, return_value=True),
     )
     monkeypatch.setattr(
-        init_command,
+        init,
         get_windows_home_path_in_wsl.__name__,
         Mock(spec=get_windows_home_path_in_wsl, return_value=windows_home),
     )
@@ -1570,16 +1570,16 @@ def test_setup_passwordless_ssh_access(
         spec=setup_passwordless_ssh_access_to_cluster,
         side_effect=[accept_mila, *(accept_drac for _ in drac_clusters_in_ssh_config)],
     )
-    import milatools.cli.init_command
+    import milatools.cli.init
 
     monkeypatch.setattr(
-        milatools.cli.init_command,
+        milatools.cli.init,
         setup_passwordless_ssh_access_to_cluster.__name__,
         mock_setup_passwordless_ssh_access_to_cluster,
     )
 
     monkeypatch.setattr(
-        milatools.cli.init_command,
+        milatools.cli.init,
         setup_keys_on_login_node.__name__,
         Mock(spec=setup_keys_on_login_node),
     )

diff --git a/...mmand/test_fixes_overly_general_entry.txt → ..._init/test_fixes_overly_general_entry.txt b/...mmand/test_fixes_overly_general_entry.txt → ..._init/test_fixes_overly_general_entry.txt
diff --git a/..._accept_registering_key_already_setup_.md → ..._accept_registering_key_already_setup_.md b/..._accept_registering_key_already_setup_.md → ..._accept_registering_key_already_setup_.md
diff --git a/...ept_registering_key_not_already_setup_.md → ...ept_registering_key_not_already_setup_.md b/...ept_registering_key_not_already_setup_.md → ...ept_registering_key_not_already_setup_.md
diff --git a/..._reject_registering_key_already_setup_.md → ..._reject_registering_key_already_setup_.md b/..._reject_registering_key_already_setup_.md → ..._reject_registering_key_already_setup_.md
diff --git a/...ect_registering_key_not_already_setup_.md → ...ect_registering_key_not_already_setup_.md b/...ect_registering_key_not_already_setup_.md → ...ect_registering_key_not_already_setup_.md
diff --git a/..._setup_ssh_empty_confirm_changes_drac_.md → ..._setup_ssh_empty_confirm_changes_drac_.md b/..._setup_ssh_empty_confirm_changes_drac_.md → ..._setup_ssh_empty_confirm_changes_drac_.md
diff --git a/...tup_ssh_empty_confirm_changes_no_drac_.md → ...tup_ssh_empty_confirm_changes_no_drac_.md b/...tup_ssh_empty_confirm_changes_no_drac_.md → ...tup_ssh_empty_confirm_changes_no_drac_.md
diff --git a/...t_setup_ssh_empty_reject_changes_drac_.md → ...t_setup_ssh_empty_reject_changes_drac_.md b/...t_setup_ssh_empty_reject_changes_drac_.md → ...t_setup_ssh_empty_reject_changes_drac_.md
diff --git a/...etup_ssh_empty_reject_changes_no_drac_.md → ...etup_ssh_empty_reject_changes_no_drac_.md b/...etup_ssh_empty_reject_changes_no_drac_.md → ...etup_ssh_empty_reject_changes_no_drac_.md
diff --git a/...omment_and_entry_confirm_changes_drac_.md → ...omment_and_entry_confirm_changes_drac_.md b/...omment_and_entry_confirm_changes_drac_.md → ...omment_and_entry_confirm_changes_drac_.md
diff --git a/...ent_and_entry_confirm_changes_no_drac_.md → ...ent_and_entry_confirm_changes_no_drac_.md b/...ent_and_entry_confirm_changes_no_drac_.md → ...ent_and_entry_confirm_changes_no_drac_.md
diff --git a/...comment_and_entry_reject_changes_drac_.md → ...comment_and_entry_reject_changes_drac_.md b/...comment_and_entry_reject_changes_drac_.md → ...comment_and_entry_reject_changes_drac_.md
diff --git a/...ment_and_entry_reject_changes_no_drac_.md → ...ment_and_entry_reject_changes_no_drac_.md b/...ment_and_entry_reject_changes_no_drac_.md → ...ment_and_entry_reject_changes_no_drac_.md
diff --git a/...with_extra_space_confirm_changes_drac_.md → ...with_extra_space_confirm_changes_drac_.md b/...with_extra_space_confirm_changes_drac_.md → ...with_extra_space_confirm_changes_drac_.md
diff --git a/...h_extra_space_confirm_changes_no_drac_.md → ...h_extra_space_confirm_changes_no_drac_.md b/...h_extra_space_confirm_changes_no_drac_.md → ...h_extra_space_confirm_changes_no_drac_.md
diff --git a/..._with_extra_space_reject_changes_drac_.md → ..._with_extra_space_reject_changes_drac_.md b/..._with_extra_space_reject_changes_drac_.md → ..._with_extra_space_reject_changes_drac_.md
diff --git a/...th_extra_space_reject_changes_no_drac_.md → ...th_extra_space_reject_changes_no_drac_.md b/...th_extra_space_reject_changes_no_drac_.md → ...th_extra_space_reject_changes_no_drac_.md
diff --git a/..._ssh_has_comment_confirm_changes_drac_.md → ..._ssh_has_comment_confirm_changes_drac_.md b/..._ssh_has_comment_confirm_changes_drac_.md → ..._ssh_has_comment_confirm_changes_drac_.md
diff --git a/...h_has_comment_confirm_changes_no_drac_.md → ...h_has_comment_confirm_changes_no_drac_.md b/...h_has_comment_confirm_changes_no_drac_.md → ...h_has_comment_confirm_changes_no_drac_.md
diff --git a/...p_ssh_has_comment_reject_changes_drac_.md → ...p_ssh_has_comment_reject_changes_drac_.md b/...p_ssh_has_comment_reject_changes_drac_.md → ...p_ssh_has_comment_reject_changes_drac_.md
diff --git a/...sh_has_comment_reject_changes_no_drac_.md → ...sh_has_comment_reject_changes_no_drac_.md b/...sh_has_comment_reject_changes_no_drac_.md → ...sh_has_comment_reject_changes_no_drac_.md
diff --git a/...different_indent_confirm_changes_drac_.md → ...different_indent_confirm_changes_drac_.md b/...different_indent_confirm_changes_drac_.md → ...different_indent_confirm_changes_drac_.md
diff --git a/...ferent_indent_confirm_changes_no_drac_.md → ...ferent_indent_confirm_changes_no_drac_.md b/...ferent_indent_confirm_changes_no_drac_.md → ...ferent_indent_confirm_changes_no_drac_.md
diff --git a/..._different_indent_reject_changes_drac_.md → ..._different_indent_reject_changes_drac_.md b/..._different_indent_reject_changes_drac_.md → ..._different_indent_reject_changes_drac_.md
diff --git a/...fferent_indent_reject_changes_no_drac_.md → ...fferent_indent_reject_changes_no_drac_.md b/...fferent_indent_reject_changes_no_drac_.md → ...fferent_indent_reject_changes_no_drac_.md
diff --git a/...est_setup_vscode_settings_accept_None_.md → ...est_setup_vscode_settings_accept_None_.md b/...est_setup_vscode_settings_accept_None_.md → ...est_setup_vscode_settings_accept_None_.md
diff --git a/...ode_settings_accept_initial_settings1_.md → ...ode_settings_accept_initial_settings1_.md b/...ode_settings_accept_initial_settings1_.md → ...ode_settings_accept_initial_settings1_.md
diff --git a/...ode_settings_accept_initial_settings2_.md → ...ode_settings_accept_initial_settings2_.md b/...ode_settings_accept_initial_settings2_.md → ...ode_settings_accept_initial_settings2_.md
diff --git a/...ode_settings_accept_initial_settings3_.md → ...ode_settings_accept_initial_settings3_.md b/...ode_settings_accept_initial_settings3_.md → ...ode_settings_accept_initial_settings3_.md
diff --git a/...ode_settings_accept_initial_settings4_.md → ...ode_settings_accept_initial_settings4_.md b/...ode_settings_accept_initial_settings4_.md → ...ode_settings_accept_initial_settings4_.md
diff --git a/...up_windows_ssh_config_from_wsl_accept_.md → ...up_windows_ssh_config_from_wsl_accept_.md b/...up_windows_ssh_config_from_wsl_accept_.md → ...up_windows_ssh_config_from_wsl_accept_.md
diff --git a/...up_windows_ssh_config_from_wsl_reject_.md → ...up_windows_ssh_config_from_wsl_reject_.md b/...up_windows_ssh_config_from_wsl_reject_.md → ...up_windows_ssh_config_from_wsl_reject_.md
diff --git a/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md b/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md
diff --git a/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md b/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md
diff --git a/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md b/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md
diff --git a/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md b/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md
diff --git a/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md b/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md
diff --git a/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md b/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md
diff --git a/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md b/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md
diff --git a/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md b/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md
diff --git a/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md b/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md
diff --git a/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md b/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md
diff --git a/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md b/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md
diff --git a/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md b/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md
diff --git a/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md b/...entry_has_mila_entry_has_drac_entries_.md → ...entry_has_mila_entry_has_drac_entries_.md
diff --git a/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md b/..._entry_has_mila_entry_no_drac_entries_.md → ..._entry_has_mila_entry_no_drac_entries_.md
diff --git a/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md b/..._entry_no_mila_entry_has_drac_entries_.md → ..._entry_no_mila_entry_has_drac_entries_.md
diff --git a/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md b/...u_entry_no_mila_entry_no_drac_entries_.md → ...u_entry_no_mila_entry_no_drac_entries_.md
diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py
@@ -16,7 +16,7 @@
     yn,
 )
 
-from .test_init_command import PipeInput, input_pipe  # noqa
+from .test_init import PipeInput, input_pipe  # noqa
 
 
 def test_randname(file_regression):

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -16,7 +16,7 @@
 import questionary
 from fabric.connection import Connection
 
-from milatools.cli.init_command import setup_ssh_config
+from milatools.cli.init import setup_ssh_config
 from milatools.utils.compute_node import get_queued_milatools_job_ids
 from milatools.utils.remote_v1 import RemoteV1
 from milatools.utils.remote_v2 import (
@@ -360,7 +360,7 @@ def ssh_config_file(
     monkeypatch: pytest.MonkeyPatch,
 ) -> Path:
     """Fixture that creates the SSH config as setup by `mila init`."""
-    from milatools.cli.init_command import yn
+    from milatools.cli.init import yn
 
     # NOTE: might want to put this in a fixture if we wanted the "real" mila / drac
     # usernames in the config.
@@ -381,9 +381,9 @@ def _yn(question: str) -> bool:
 
     mock_yn = Mock(spec=yn, side_effect=_yn)
 
-    import milatools.cli.init_command
+    import milatools.cli.init
 
-    monkeypatch.setattr(milatools.cli.init_command, yn.__name__, mock_yn)
+    monkeypatch.setattr(milatools.cli.init, yn.__name__, mock_yn)
 
     def _mock_unsafe_ask(question: str, *args, **kwargs) -> str:
         question = question.strip()