Change to src-layout (#164)

* Change to src-layout * Update Dockerfile
oittaa · Apr 13, 2022 · db70e5b · db70e5b
1 parent 48d9c83
commit db70e5b
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ENV STORAGE_DIR storage
 # Python app installation
 WORKDIR $APP_HOME
 COPY README.md pyproject.toml setup.py ./
-COPY gcp_storage_emulator gcp_storage_emulator/
+COPY src src/
 RUN pip install .
 
 ENTRYPOINT ["gcp-storage-emulator"]

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ requires = [
 ]
 
 [tool.pytest.ini_options]
-addopts = "--cov=gcp_storage_emulator --cov-report=xml --cov-branch"
+addopts = "--cov=src --cov-report=xml --cov-branch"
 testpaths = [
  "tests"
 ]
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 NAME = "gcp-storage-emulator"
-PACKAGES = find_packages()
+PACKAGES = find_packages("src")
 
 DESCRIPTION = "A stub emulator for the Google Cloud Storage API"
 URL = "https://github.com/oittaa/gcp-storage-emulator"
@@ -29,6 +29,7 @@
  author=AUTHOR,
  author_email=AUTHOR_EMAIL,
  packages=PACKAGES,
+ package_dir={"": "src"},
  zip_safe=False,
  keywords=[
  "Google Cloud Storage",

diff --git a/gcp_storage_emulator/__init__.py → src/gcp_storage_emulator/__init__.py b/gcp_storage_emulator/__init__.py → src/gcp_storage_emulator/__init__.py
diff --git a/gcp_storage_emulator/__main__.py → src/gcp_storage_emulator/__main__.py b/gcp_storage_emulator/__main__.py → src/gcp_storage_emulator/__main__.py
diff --git a/gcp_storage_emulator/exceptions.py → src/gcp_storage_emulator/exceptions.py b/gcp_storage_emulator/exceptions.py → src/gcp_storage_emulator/exceptions.py
diff --git a/gcp_storage_emulator/handlers/__init__.py → ...gcp_storage_emulator/handlers/__init__.py b/gcp_storage_emulator/handlers/__init__.py → ...gcp_storage_emulator/handlers/__init__.py
diff --git a/gcp_storage_emulator/handlers/buckets.py → src/gcp_storage_emulator/handlers/buckets.py b/gcp_storage_emulator/handlers/buckets.py → src/gcp_storage_emulator/handlers/buckets.py
diff --git a/gcp_storage_emulator/handlers/objects.py → src/gcp_storage_emulator/handlers/objects.py b/gcp_storage_emulator/handlers/objects.py → src/gcp_storage_emulator/handlers/objects.py
diff --git a/gcp_storage_emulator/server.py → src/gcp_storage_emulator/server.py b/gcp_storage_emulator/server.py → src/gcp_storage_emulator/server.py
diff --git a/gcp_storage_emulator/settings.py → src/gcp_storage_emulator/settings.py b/gcp_storage_emulator/settings.py → src/gcp_storage_emulator/settings.py
diff --git a/gcp_storage_emulator/storage.py → src/gcp_storage_emulator/storage.py b/gcp_storage_emulator/storage.py → src/gcp_storage_emulator/storage.py