From 267e5a6979567a028bc81063b52bddd1f58d5ff1 Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 24 Jun 2024 17:04:50 -0400 Subject: [PATCH] Adjust ci paths --- tests/conftest.py | 6 +++--- tests/sherlock_interactives.py | 2 +- tests/test_manifest.py | 6 +++--- tests/test_version.py | 4 ++-- tox.ini | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 2dcf7843..51c90814 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,18 +6,18 @@ from sherlock_project.sites import SitesInformation @pytest.fixture() def sites_obj(): - sites_obj = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock/resources/data.json")) + sites_obj = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock_project/resources/data.json")) yield sites_obj @pytest.fixture(scope="session") def sites_info(): - sites_obj = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock/resources/data.json")) + sites_obj = SitesInformation(data_file_path=os.path.join(os.path.dirname(__file__), "../sherlock_project/resources/data.json")) sites_iterable = {site.name: site.information for site in sites_obj} yield sites_iterable @pytest.fixture(scope="session") def remote_schema(): - schema_url: str = 'https://raw.githubusercontent.com/sherlock-project/sherlock/master/sherlock/resources/data.schema.json' + schema_url: str = 'https://raw.githubusercontent.com/sherlock-project/sherlock/master/sherlock_project/resources/data.schema.json' with urllib.request.urlopen(schema_url) as remoteschema: schemadat = json.load(remoteschema) yield schemadat diff --git a/tests/sherlock_interactives.py b/tests/sherlock_interactives.py index d0424af1..2c9d9d95 100644 --- a/tests/sherlock_interactives.py +++ b/tests/sherlock_interactives.py @@ -25,7 +25,7 @@ class Interactives: """Check all files within the Sherlock package for matching patterns""" pattern:re.Pattern = re.compile(pattern) matching_files:list[str] = [] - for root, dirs, files in os.walk("sherlock"): + for root, dirs, files in os.walk("sherlock_project"): for file in files: file_path = os.path.join(root,file) if "__pycache__" in file_path: diff --git a/tests/test_manifest.py b/tests/test_manifest.py index 177af21e..5c47fbb8 100644 --- a/tests/test_manifest.py +++ b/tests/test_manifest.py @@ -5,8 +5,8 @@ from jsonschema import validate def test_validate_manifest_against_local_schema(): """Ensures that the manifest matches the local schema, for situations where the schema is being changed.""" - json_relative: str = '../sherlock/resources/data.json' - schema_relative: str = '../sherlock/resources/data.schema.json' + json_relative: str = '../sherlock_project/resources/data.json' + schema_relative: str = '../sherlock_project/resources/data.schema.json' json_path: str = os.path.join(os.path.dirname(__file__), json_relative) schema_path: str = os.path.join(os.path.dirname(__file__), schema_relative) @@ -22,7 +22,7 @@ def test_validate_manifest_against_local_schema(): @pytest.mark.online def test_validate_manifest_against_remote_schema(remote_schema): """Ensures that the manifest matches the remote schema, so as to not unexpectedly break clients.""" - json_relative: str = '../sherlock/resources/data.json' + json_relative: str = '../sherlock_project/resources/data.json' json_path: str = os.path.join(os.path.dirname(__file__), json_relative) with open(json_path, 'r') as f: diff --git a/tests/test_version.py b/tests/test_version.py index c4fd00de..91842229 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -10,8 +10,8 @@ def test_versioning() -> None: found:list = Interactives.walk_sherlock_for_files_with(r'__version__ *= *') expected:list = [ # Normalization is REQUIRED for Windows ( / vs \ ) - os.path.normpath("sherlock/__init__.py"), - os.path.normpath("sherlock/sherlock.py"), + os.path.normpath("sherlock_project/__init__.py"), + os.path.normpath("sherlock_project/sherlock.py"), ] # Sorting is REQUIRED for Mac assert sorted(found) == sorted(expected) diff --git a/tox.ini b/tox.ini index 0c309410..933b6a38 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ deps = pytest allowlist_externals = coverage commands = - coverage run --source=sherlock --module pytest -v + coverage run --source=sherlock_project --module pytest -v coverage report --show-missing [testenv:offline]