From 1369cb3e0fe7c73d59c978be2709e818317d471b Mon Sep 17 00:00:00 2001 From: JoeZiminski Date: Wed, 25 Feb 2026 19:09:56 +0000 Subject: [PATCH 1/6] Fix test. --- datashuttle/datashuttle_class.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datashuttle/datashuttle_class.py b/datashuttle/datashuttle_class.py index d85a77c81..dabfb7ff4 100644 --- a/datashuttle/datashuttle_class.py +++ b/datashuttle/datashuttle_class.py @@ -1229,7 +1229,8 @@ def update_config_file(self, **kwargs) -> None: kwargs["connection_method"] = "local_only" if ( - self.cfg["connection_method"] == "local_only" + "connection_method" in self.cfg + and self.cfg["connection_method"] == "local_only" and kwargs["connection_method"] != "local_only" ): # We need to ensure this rclone config is created if it was not created during From c606ecde769ef79b609d3298cd87acdd1893a4dc Mon Sep 17 00:00:00 2001 From: Joe Ziminski <55797454+JoeZiminski@users.noreply.github.com> Date: Wed, 25 Feb 2026 20:11:06 +0000 Subject: [PATCH 2/6] Update datashuttle_class.py --- datashuttle/datashuttle_class.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/datashuttle/datashuttle_class.py b/datashuttle/datashuttle_class.py index dabfb7ff4..60caf4aaf 100644 --- a/datashuttle/datashuttle_class.py +++ b/datashuttle/datashuttle_class.py @@ -1228,18 +1228,17 @@ def update_config_file(self, **kwargs) -> None: # For backward compatibility kwargs["connection_method"] = "local_only" - if ( - "connection_method" in self.cfg - and self.cfg["connection_method"] == "local_only" - and kwargs["connection_method"] != "local_only" - ): - # We need to ensure this rclone config is created if it was not created during - # initial set up because the project is local only. The rclone config for local filesystem - # is just a placeholder rclone config file anyway. This is not ideal but the alternative is to search - # for an existing config and create only if it does not exist, which requires calls to - # rclone because its config-saving path is not predictable, and this will be very - # slow and essentially pointless as recreating the config should simply overwrite it. - self._setup_rclone_central_local_filesystem_config() + if ( + and self.cfg["connection_method"] == "local_only" + and kwargs["connection_method"] != "local_only" + ): + # We need to ensure this rclone config is created if it was not created during + # initial set up because the project is local only. The rclone config for local filesystem + # is just a placeholder rclone config file anyway. This is not ideal but the alternative is to search + # for an existing config and create only if it does not exist, which requires calls to + # rclone because its config-saving path is not predictable, and this will be very + # slow and essentially pointless as recreating the config should simply overwrite it. + self._setup_rclone_central_local_filesystem_config() new_cfg = copy.deepcopy(self.cfg) new_cfg.update(**kwargs) From 7246172eda859ee09ce1626149d791db2d50130f Mon Sep 17 00:00:00 2001 From: Joe Ziminski <55797454+JoeZiminski@users.noreply.github.com> Date: Wed, 25 Feb 2026 20:12:04 +0000 Subject: [PATCH 3/6] Update datashuttle_class.py --- datashuttle/datashuttle_class.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/datashuttle/datashuttle_class.py b/datashuttle/datashuttle_class.py index 60caf4aaf..13f7328a4 100644 --- a/datashuttle/datashuttle_class.py +++ b/datashuttle/datashuttle_class.py @@ -1233,11 +1233,8 @@ def update_config_file(self, **kwargs) -> None: and kwargs["connection_method"] != "local_only" ): # We need to ensure this rclone config is created if it was not created during - # initial set up because the project is local only. The rclone config for local filesystem - # is just a placeholder rclone config file anyway. This is not ideal but the alternative is to search - # for an existing config and create only if it does not exist, which requires calls to - # rclone because its config-saving path is not predictable, and this will be very - # slow and essentially pointless as recreating the config should simply overwrite it. + # initial set up because the project is local only. It does not matter if the + # RClone config is ever overwritten, it's just a placeholder. self._setup_rclone_central_local_filesystem_config() new_cfg = copy.deepcopy(self.cfg) From 0aaa3a2b74c46b1f8203b5602a21da40219371d1 Mon Sep 17 00:00:00 2001 From: Joe Ziminski <55797454+JoeZiminski@users.noreply.github.com> Date: Wed, 25 Feb 2026 20:12:59 +0000 Subject: [PATCH 4/6] Update datashuttle_class.py --- datashuttle/datashuttle_class.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datashuttle/datashuttle_class.py b/datashuttle/datashuttle_class.py index 13f7328a4..2596cb2d1 100644 --- a/datashuttle/datashuttle_class.py +++ b/datashuttle/datashuttle_class.py @@ -1229,7 +1229,7 @@ def update_config_file(self, **kwargs) -> None: kwargs["connection_method"] = "local_only" if ( - and self.cfg["connection_method"] == "local_only" + self.cfg["connection_method"] == "local_only" and kwargs["connection_method"] != "local_only" ): # We need to ensure this rclone config is created if it was not created during From 77bede75681614c1627b5f6988e602a5ba93a219 Mon Sep 17 00:00:00 2001 From: JoeZiminski Date: Wed, 25 Feb 2026 22:00:46 +0000 Subject: [PATCH 5/6] Fix tests. --- tests/tests_transfers/gdrive/test_tui_setup_gdrive.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/tests_transfers/gdrive/test_tui_setup_gdrive.py b/tests/tests_transfers/gdrive/test_tui_setup_gdrive.py index 8f2657114..2e092fa0d 100644 --- a/tests/tests_transfers/gdrive/test_tui_setup_gdrive.py +++ b/tests/tests_transfers/gdrive/test_tui_setup_gdrive.py @@ -152,13 +152,6 @@ async def test_gdrive_connection_setup_without_browser( pilot, "#setup_gdrive_finish_button" ) - assert ( - pilot.app.screen.query_one( - "#configs_go_to_project_screen_button" - ).visible - is True - ) - @pytest.mark.asyncio async def test_gdrive_connection_setup_incorrect_config_token( self, setup_project_paths From d3223869ea732be3f117054cd6df3fa2f5ce7939 Mon Sep 17 00:00:00 2001 From: JoeZiminski Date: Wed, 25 Feb 2026 23:04:58 +0000 Subject: [PATCH 6/6] Fix tests...again... --- tests/tests_transfers/aws/test_tui_setup_aws.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/tests_transfers/aws/test_tui_setup_aws.py b/tests/tests_transfers/aws/test_tui_setup_aws.py index 2d20cc638..baf285968 100644 --- a/tests/tests_transfers/aws/test_tui_setup_aws.py +++ b/tests/tests_transfers/aws/test_tui_setup_aws.py @@ -108,13 +108,6 @@ async def test_aws_connection_setup( await self.scroll_to_click_pause(pilot, "#setup_aws_ok_button") - assert ( - pilot.app.screen.query_one( - "#configs_go_to_project_screen_button" - ).visible - is True - ) - @pytest.mark.asyncio async def test_aws_connection_setup_failed(self, central_path_and_project): """Test AWS connection setup using an incorrect client secret and check