diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index e3169b2..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include standard_names/data/* diff --git a/noxfile.py b/noxfile.py index bec8e38..6cdd230 100644 --- a/noxfile.py +++ b/noxfile.py @@ -109,11 +109,11 @@ def clean(session): shutil.rmtree("build", ignore_errors=True) shutil.rmtree("dist", ignore_errors=True) - shutil.rmtree(f"{PROJECT}.egg-info", ignore_errors=True) + shutil.rmtree(f"src/{PROJECT}.egg-info", ignore_errors=True) shutil.rmtree(".pytest_cache", ignore_errors=True) shutil.rmtree(".venv", ignore_errors=True) - for d in ("standard_names", "tests"): + for d in ("src", "tests"): with session.chdir(d): for pattern in ["*.py[co]", "__pycache__", "*.c", "*.so"]: _clean_rglob(pattern) diff --git a/pyproject.toml b/pyproject.toml index ba58bad..9b496e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,26 +84,23 @@ content-type = "text/markdown" [tool.setuptools.dynamic.version] attr = "standard_names._version.__version__" +[tool.setuptools.package-data] +standard_names = [ + "data/*.txt", +] + [tool.setuptools.packages.find] where = [ - ".", -] -namespaces = true -include = [ - "standard_names*", + "src", ] [tool.isort] -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -combine_as_imports = true -line_length = 88 +profile = "black" [tool.pytest.ini_options] minversion = "6.0" testpaths = [ - "standard_names", + "src/standard_names", "tests", ] norecursedirs = [ @@ -127,4 +124,4 @@ doctest_optionflags = [ [tool.zest-releaser] tag-format = "v{version}" -python-file-with-version = "standard_names/_version.py" +python-file-with-version = "src/standard_names/_version.py" diff --git a/standard_names/__init__.py b/src/standard_names/__init__.py similarity index 100% rename from standard_names/__init__.py rename to src/standard_names/__init__.py diff --git a/standard_names/_version.py b/src/standard_names/_version.py similarity index 100% rename from standard_names/_version.py rename to src/standard_names/_version.py diff --git a/standard_names/cmd/__init__.py b/src/standard_names/cmd/__init__.py similarity index 100% rename from standard_names/cmd/__init__.py rename to src/standard_names/cmd/__init__.py diff --git a/standard_names/cmd/snbuild.py b/src/standard_names/cmd/snbuild.py similarity index 100% rename from standard_names/cmd/snbuild.py rename to src/standard_names/cmd/snbuild.py diff --git a/standard_names/cmd/sndump.py b/src/standard_names/cmd/sndump.py similarity index 100% rename from standard_names/cmd/sndump.py rename to src/standard_names/cmd/sndump.py diff --git a/standard_names/cmd/snscrape.py b/src/standard_names/cmd/snscrape.py similarity index 100% rename from standard_names/cmd/snscrape.py rename to src/standard_names/cmd/snscrape.py diff --git a/standard_names/cmd/snsql.py b/src/standard_names/cmd/snsql.py similarity index 100% rename from standard_names/cmd/snsql.py rename to src/standard_names/cmd/snsql.py diff --git a/standard_names/cmd/snvalidate.py b/src/standard_names/cmd/snvalidate.py similarity index 100% rename from standard_names/cmd/snvalidate.py rename to src/standard_names/cmd/snvalidate.py diff --git a/standard_names/data/names-0.8.3.txt b/src/standard_names/data/names-0.8.3.txt similarity index 100% rename from standard_names/data/names-0.8.3.txt rename to src/standard_names/data/names-0.8.3.txt diff --git a/standard_names/data/names-0.8.5.txt b/src/standard_names/data/names-0.8.5.txt similarity index 100% rename from standard_names/data/names-0.8.5.txt rename to src/standard_names/data/names-0.8.5.txt diff --git a/standard_names/error.py b/src/standard_names/error.py similarity index 100% rename from standard_names/error.py rename to src/standard_names/error.py diff --git a/standard_names/registry.py b/src/standard_names/registry.py similarity index 100% rename from standard_names/registry.py rename to src/standard_names/registry.py diff --git a/standard_names/standardname.py b/src/standard_names/standardname.py similarity index 100% rename from standard_names/standardname.py rename to src/standard_names/standardname.py diff --git a/standard_names/utilities/__init__.py b/src/standard_names/utilities/__init__.py similarity index 100% rename from standard_names/utilities/__init__.py rename to src/standard_names/utilities/__init__.py diff --git a/standard_names/utilities/decorators.py b/src/standard_names/utilities/decorators.py similarity index 100% rename from standard_names/utilities/decorators.py rename to src/standard_names/utilities/decorators.py diff --git a/standard_names/utilities/io.py b/src/standard_names/utilities/io.py similarity index 100% rename from standard_names/utilities/io.py rename to src/standard_names/utilities/io.py