Move to src layout (#360)

evansd · Feb 7, 2022 · d8ef2b3 · d8ef2b3
1 parent 6f008ea
commit d8ef2b3
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ __pycache__
 /htmlcov
 /docs/_build
 /dist
-/*.egg-info
+/src/*.egg-info
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,7 +8,7 @@ exclude .editorconfig
 exclude .pre-commit-config.yaml
 exclude .readthedocs.yaml
 exclude CHANGELOG.rst
-include pyproject.toml
 exclude tox.ini
 include LICENSE
+include pyproject.toml
 include README.rst
diff --git a/scripts/generate_default_media_types.py b/scripts/generate_default_media_types.py
@@ -8,7 +8,7 @@
 from pathlib import Path
 
 module_dir = Path(__file__).parent.resolve()
-media_types_py = module_dir / ".." / "whitenoise" / "media_types.py"
+media_types_py = module_dir / "../src/whitenoise/media_types.py"
 
 
 def main():

diff --git a/setup.cfg b/setup.cfg
@@ -33,6 +33,8 @@ classifiers =
 license_file = LICENSE
 
 [options]
+package_dir=
+    =src
 packages = find:
 include_package_data = True
 python_requires = >=3.7
@@ -43,13 +45,13 @@ brotli =
     Brotli
 
 [options.packages.find]
-exclude = tests
+where = src
 
 [flake8]
 max-line-length = 88
 extend-ignore = E203
 per-file-ignores =
-    whitenoise/media_types.py:E501
+    src/whitenoise/media_types.py:E501
 
 [coverage:run]
 branch = True
@@ -58,5 +60,10 @@ source =
     whitenoise
     tests
 
+[coverage:paths]
+source =
+   src
+   .tox/*/site-packages
+
 [coverage:report]
 show_missing = True
diff --git a/whitenoise/__init__.py → src/whitenoise/__init__.py b/whitenoise/__init__.py → src/whitenoise/__init__.py
diff --git a/whitenoise/base.py → src/whitenoise/base.py b/whitenoise/base.py → src/whitenoise/base.py
diff --git a/whitenoise/compress.py → src/whitenoise/compress.py b/whitenoise/compress.py → src/whitenoise/compress.py
diff --git a/whitenoise/media_types.py → src/whitenoise/media_types.py b/whitenoise/media_types.py → src/whitenoise/media_types.py
diff --git a/whitenoise/middleware.py → src/whitenoise/middleware.py b/whitenoise/middleware.py → src/whitenoise/middleware.py
diff --git a/whitenoise/responders.py → src/whitenoise/responders.py b/whitenoise/responders.py → src/whitenoise/responders.py
diff --git a/whitenoise/runserver_nostatic/__init__.py → ...whitenoise/runserver_nostatic/__init__.py b/whitenoise/runserver_nostatic/__init__.py → ...whitenoise/runserver_nostatic/__init__.py
diff --git a/...runserver_nostatic/management/__init__.py → ...runserver_nostatic/management/__init__.py b/...runserver_nostatic/management/__init__.py → ...runserver_nostatic/management/__init__.py
diff --git a/..._nostatic/management/commands/__init__.py → ..._nostatic/management/commands/__init__.py b/..._nostatic/management/commands/__init__.py → ..._nostatic/management/commands/__init__.py
diff --git a/...nostatic/management/commands/runserver.py → ...nostatic/management/commands/runserver.py b/...nostatic/management/commands/runserver.py → ...nostatic/management/commands/runserver.py
diff --git a/whitenoise/storage.py → src/whitenoise/storage.py b/whitenoise/storage.py → src/whitenoise/storage.py
diff --git a/whitenoise/string_utils.py → src/whitenoise/string_utils.py b/whitenoise/string_utils.py → src/whitenoise/string_utils.py