switch to a src-layout; remove manifest

csdms · Feb 16, 2024 · 5d183de · 5d183de
1 parent 1de2fca
commit 5d183de
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 15 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git 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
@@ -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 → src/standard_names/__init__.py b/standard_names/__init__.py → src/standard_names/__init__.py
diff --git a/standard_names/_version.py → src/standard_names/_version.py b/standard_names/_version.py → src/standard_names/_version.py
diff --git a/standard_names/cmd/__init__.py → src/standard_names/cmd/__init__.py b/standard_names/cmd/__init__.py → src/standard_names/cmd/__init__.py
diff --git a/standard_names/cmd/snbuild.py → src/standard_names/cmd/snbuild.py b/standard_names/cmd/snbuild.py → src/standard_names/cmd/snbuild.py
diff --git a/standard_names/cmd/sndump.py → src/standard_names/cmd/sndump.py b/standard_names/cmd/sndump.py → src/standard_names/cmd/sndump.py
diff --git a/standard_names/cmd/snscrape.py → src/standard_names/cmd/snscrape.py b/standard_names/cmd/snscrape.py → src/standard_names/cmd/snscrape.py
diff --git a/standard_names/cmd/snsql.py → src/standard_names/cmd/snsql.py b/standard_names/cmd/snsql.py → src/standard_names/cmd/snsql.py
diff --git a/standard_names/cmd/snvalidate.py → src/standard_names/cmd/snvalidate.py b/standard_names/cmd/snvalidate.py → src/standard_names/cmd/snvalidate.py
diff --git a/standard_names/data/names-0.8.3.txt → src/standard_names/data/names-0.8.3.txt b/standard_names/data/names-0.8.3.txt → src/standard_names/data/names-0.8.3.txt
diff --git a/standard_names/data/names-0.8.5.txt → src/standard_names/data/names-0.8.5.txt b/standard_names/data/names-0.8.5.txt → src/standard_names/data/names-0.8.5.txt
diff --git a/standard_names/error.py → src/standard_names/error.py b/standard_names/error.py → src/standard_names/error.py
diff --git a/standard_names/registry.py → src/standard_names/registry.py b/standard_names/registry.py → src/standard_names/registry.py
diff --git a/standard_names/standardname.py → src/standard_names/standardname.py b/standard_names/standardname.py → src/standard_names/standardname.py
diff --git a/standard_names/utilities/__init__.py → src/standard_names/utilities/__init__.py b/standard_names/utilities/__init__.py → src/standard_names/utilities/__init__.py
diff --git a/standard_names/utilities/decorators.py → src/standard_names/utilities/decorators.py b/standard_names/utilities/decorators.py → src/standard_names/utilities/decorators.py
diff --git a/standard_names/utilities/io.py → src/standard_names/utilities/io.py b/standard_names/utilities/io.py → src/standard_names/utilities/io.py