Skip to content

Commit de52dac

Browse files
Remove deprecated external storage tests
Remove test files that depend on the deprecated datajoint.external module which was removed in 2.0: - tests/test_external.py - tests/test_external_class.py - tests/test_attach.py - tests/test_filepath.py - tests/test_s3.py - tests/schema_external.py Also remove related fixtures from conftest.py. Co-authored-by: dimitri-yatsenko <dimitri@datajoint.com>
1 parent fc9e004 commit de52dac

File tree

7 files changed

+1
-651
lines changed

7 files changed

+1
-651
lines changed

tests/conftest.py

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
from packaging import version
1616

1717
import datajoint as dj
18-
from datajoint.errors import (
19-
FILEPATH_FEATURE_SWITCH,
20-
)
2118

22-
from . import schema, schema_advanced, schema_external, schema_object, schema_simple
19+
from . import schema, schema_advanced, schema_object, schema_simple
2320
from . import schema_uuid as schema_uuid_module
2421
from . import schema_type_aliases as schema_type_aliases_module
2522

@@ -327,13 +324,6 @@ def enable_adapted_types():
327324
yield
328325

329326

330-
@pytest.fixture
331-
def enable_filepath_feature(monkeypatch):
332-
monkeypatch.setenv(FILEPATH_FEATURE_SWITCH, "TRUE")
333-
yield
334-
monkeypatch.delenv(FILEPATH_FEATURE_SWITCH, raising=True)
335-
336-
337327
@pytest.fixture(scope="session")
338328
def db_creds_test(mysql_container) -> Dict:
339329
_, host, port = mysql_container
@@ -710,25 +700,6 @@ def schema_adv(connection_test, prefix):
710700
schema.drop()
711701

712702

713-
@pytest.fixture
714-
def schema_ext(connection_test, enable_filepath_feature, mock_stores, mock_cache, prefix):
715-
schema = dj.Schema(
716-
prefix + "_extern",
717-
context=schema_external.LOCALS_EXTERNAL,
718-
connection=connection_test,
719-
)
720-
schema(schema_external.Simple)
721-
schema(schema_external.SimpleRemote)
722-
schema(schema_external.Seed)
723-
schema(schema_external.Dimension)
724-
schema(schema_external.Image)
725-
schema(schema_external.Attach)
726-
schema(schema_external.Filepath)
727-
schema(schema_external.FilepathS3)
728-
yield schema
729-
schema.drop()
730-
731-
732703
@pytest.fixture(scope="module")
733704
def schema_uuid(connection_test, prefix):
734705
schema = dj.Schema(

tests/schema_external.py

Lines changed: 0 additions & 89 deletions
This file was deleted.

tests/test_attach.py

Lines changed: 0 additions & 63 deletions
This file was deleted.

tests/test_external.py

Lines changed: 0 additions & 114 deletions
This file was deleted.

tests/test_external_class.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)