Update CI script.

Author: JoeZiminski

.github/workflows/code_test_and_deploy.yml

@@ -57,17 +57,18 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install .[dev]
-      - name: Test
+      - name: Test All
         # run SSH tests only on Linux because Windows and macOS
         # are already run within a virtual container and so cannot
         # run Linux containers because nested containerisation is disabled.
+      - name: Test SSH (Linux only)
+        if: runner.os == 'Linux'
         run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-             sudo service mysql stop  # free up port  3306 for ssh tests: https://github.com/orgs/community/discussions/25550
-             pytest -k "test_combinations_ssh_transfer or test_ssh_setup"
-          else
-             pytest -k "not test_combinations_ssh_transfer and not test_ssh_setup"
-          fi
+          sudo service mysql stop  # free up port 3306 for ssh tests
+          pytest tests/tests_transfers/ssh
+      - name: Test All
+        run: |
+          pytest --ignore tests/tests_transfers/ssh
 
   build_sdist_wheels:
     name: Build source distribution

pyproject.toml

@@ -107,6 +107,7 @@ select = ["I", "E", "F", "TCH", "TID252"]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
+"tests/**/*" = ["TID252"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 18

tests/__init__.py

@@ -1,10 +1,11 @@
 import warnings
 
 import pytest
-import test_utils
 
 from datashuttle import DataShuttle
 
+from . import test_utils
+
 TEST_PROJECT_NAME = "test_project"
 
 

tests/base.py

@@ -10,7 +10,6 @@
 from pathlib import Path
 
 import yaml
-from file_conflicts_pathtable import get_pathtable
 
 from datashuttle import DataShuttle
 from datashuttle.configs import canonical_configs, canonical_folders
@@ -159,19 +158,6 @@ def make_test_path(base_path, local_or_central, test_project_name):
     return Path(base_path) / local_or_central / test_project_name
 
 
-def create_all_pathtable_files(pathtable):
-    """ """
-    for i in range(pathtable.shape[0]):
-        filepath = pathtable["base_folder"][i] / pathtable["path"][i]
-        filepath.parents[0].mkdir(parents=True, exist_ok=True)
-        write_file(filepath, contents="test_entry")
-
-
-def quick_create_project(base_path):
-    pathtable = get_pathtable(base_path)
-    create_all_pathtable_files(pathtable)
-
-
 # -----------------------------------------------------------------------------
 # Test Configs
 # -----------------------------------------------------------------------------

tests/conftest.py

@@ -1,13 +1,14 @@
 import os
 
 import pytest
-import test_utils
-from base import BaseTest
 
 from datashuttle import DataShuttle
 from datashuttle.utils import getters
 from datashuttle.utils.custom_exceptions import ConfigError
 
+from .. import test_utils
+from ..base import BaseTest
+
 
 class TestConfigs(BaseTest):
     # Test Errors

tests/quick_make_project.py

@@ -5,12 +5,13 @@
 from os.path import join
 
 import pytest
-import test_utils
-from base import BaseTest
 
 from datashuttle.configs import canonical_configs, canonical_folders
 from datashuttle.configs.canonical_tags import tags
 
+from .. import test_utils
+from ..base import BaseTest
+
 
 class TestCreateFolders(BaseTest):