diff --git a/docs/source/conf.py b/docs/source/conf.py index 52c1a972b..16528efae 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -19,7 +19,7 @@ exclude_patterns = [] extensions += ['sphinx.ext.autodoc', 'autoapi.extension'] -autoapi_dirs = ['../../src'] +autoapi_dirs = ['../../pyciemss'] # -- Options for HTML output ------------------------------------------------- diff --git a/src/pyciemss/__init__.py b/pyciemss/__init__.py similarity index 100% rename from src/pyciemss/__init__.py rename to pyciemss/__init__.py diff --git a/src/pyciemss/integration_utils/custom_decorators.py b/pyciemss/integration_utils/custom_decorators.py similarity index 100% rename from src/pyciemss/integration_utils/custom_decorators.py rename to pyciemss/integration_utils/custom_decorators.py diff --git a/src/pyciemss/interfaces.py b/pyciemss/interfaces.py similarity index 100% rename from src/pyciemss/interfaces.py rename to pyciemss/interfaces.py diff --git a/scripts/test.sh b/scripts/test.sh index 0102743ee..6a681c7ac 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -2,4 +2,4 @@ set -euxo pipefail ./scripts/lint.sh -pytest -s --cov=src/pyciemss/ --cov=test --cov-report=term-missing ${@-} --cov-report html +pytest -s --cov=pyciemss/ --cov=test --cov-report=term-missing ${@-} --cov-report html diff --git a/setup.cfg b/setup.cfg index 0021129a0..95b334203 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ python_requires = >=3.9 packages = find: package_dir = - = src + = pyciemss [options.package_data] * = *.json @@ -44,7 +44,7 @@ package_dir = [options.packages.find] where = - src + pyciemss [options.extras_require] @@ -58,18 +58,17 @@ tests = [flake8] max-line-length = 120 -exclude = causal_pyro, docs, build, dist, .ipynb_checkpoints, .env +exclude = docs, build, dist, .ipynb_checkpoints, .env extend-ignore = E203 [isort] profile = black -skip_glob = .ipynb_checkpoints, .env, causal_pyro +skip_glob = .ipynb_checkpoints, .env known_first_party = pyciemss, test known_third_party = torch, pyro [mypy] ignore_missing_imports = True -exclude = causal_pyro [mypy-test.models.*] ignore_errors = True \ No newline at end of file diff --git a/test/test_modules_import.py b/test/test_modules_import.py index 0dfcc0be8..3a51a52fd 100644 --- a/test/test_modules_import.py +++ b/test/test_modules_import.py @@ -29,7 +29,7 @@ def try_import(import_name): return r.__name__ == import_name - root = Path(__file__).parent.parent / "src" / "pyciemss" + root = Path(__file__).parent.parent / "pyciemss" candidates = root.glob("**/*.py") targets = [