fix: refine folder structure (#6)

bmwcarit · Dec 1, 2022 · a033438 · a033438
1 parent 0b86a73
commit a033438
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -103,4 +103,5 @@ venv.bak/
 # mypy
 .mypy_cache/
 
-dltlyse/_version.py
+src/dltlyse/_version.py
+src/dltlyse/dltlyse_results.xml
diff --git a/Dockerfile b/Dockerfile
@@ -23,19 +23,22 @@ RUN set -ex \
     && apk add python3 py3-pip py3-virtualenv \
     && cd /build/dltlyse \
     && pip install --no-cache-dir build wheel \
+    && python3 -m build --wheel \
+    && git clone https://github.com/bmwcarit/python-dlt /build/python-dlt \
+    && cd /build/python-dlt \
     && python3 -m build --wheel
 
-
 FROM alpine:3.17
 
 COPY --from=builder /usr/local/lib /usr/local/lib
 COPY --from=builder /build/dltlyse/dist/dltlyse*.whl /
+COPY --from=builder /build/python-dlt/dist/dlt*.whl /
 
 RUN set -ex \
     && ldconfig /usr/local/lib \
     && apk add --no-cache python3 py3-six \
     && apk add --no-cache --virtual .build-deps py3-pip git \
-    && pip install --no-cache-dir dltlyse*.whl \
+    && pip install --no-cache-dir dlt*.whl dltlyse*.whl \
     && apk del .build-deps
 
 ENTRYPOINT [ "dltlyse" ]

diff --git a/Dockerfile.github_flow b/Dockerfile.github_flow
@@ -14,6 +14,7 @@ RUN set -ex \
     && cmake CMakeLists.txt \
     && make -j \
     && make install \
-    && ldconfig /usr/local/lib
+    && ldconfig /usr/local/lib \
+    &&  pip install --no-cache-dir git+https://github.com/bmwcarit/python-dlt
 
 # vim: set ft=dockerfile :
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,6 @@ classifiers = [
     "Topic :: Software Development :: Testing",
 ]
 dependencies = [
-   "dlt @ git+https://github.com/bmwcarit/python-dlt"
 ]
 
 [project.optional-dependencies]
@@ -40,7 +39,7 @@ requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-write_to = "dltlyse/_version.py"
+write_to = "src/dltlyse/_version.py"
 
 [tool.black]
 line-length = 119

diff --git a/dltlyse/__init__.py → src/dltlyse/__init__.py b/dltlyse/__init__.py → src/dltlyse/__init__.py
diff --git a/dltlyse/core/__init__.py → src/dltlyse/core/__init__.py b/dltlyse/core/__init__.py → src/dltlyse/core/__init__.py
diff --git a/dltlyse/core/analyser.py → src/dltlyse/core/analyser.py b/dltlyse/core/analyser.py → src/dltlyse/core/analyser.py
diff --git a/dltlyse/core/plugin_base.py → src/dltlyse/core/plugin_base.py b/dltlyse/core/plugin_base.py → src/dltlyse/core/plugin_base.py
diff --git a/dltlyse/core/report.py → src/dltlyse/core/report.py b/dltlyse/core/report.py → src/dltlyse/core/report.py
diff --git a/dltlyse/core/utils.py → src/dltlyse/core/utils.py b/dltlyse/core/utils.py → src/dltlyse/core/utils.py
diff --git a/dltlyse/mock_dlt_message.py → src/dltlyse/mock_dlt_message.py b/dltlyse/mock_dlt_message.py → src/dltlyse/mock_dlt_message.py
diff --git a/dltlyse/plugins/__init__.py → src/dltlyse/plugins/__init__.py b/dltlyse/plugins/__init__.py → src/dltlyse/plugins/__init__.py
diff --git a/dltlyse/plugins/context.py → src/dltlyse/plugins/context.py b/dltlyse/plugins/context.py → src/dltlyse/plugins/context.py
diff --git a/dltlyse/plugins/extract_files.py → src/dltlyse/plugins/extract_files.py b/dltlyse/plugins/extract_files.py → src/dltlyse/plugins/extract_files.py
diff --git a/dltlyse/plugins/sys_errors.py → src/dltlyse/plugins/sys_errors.py b/dltlyse/plugins/sys_errors.py → src/dltlyse/plugins/sys_errors.py
diff --git a/dltlyse/plugins/sysmem_plugin.py → src/dltlyse/plugins/sysmem_plugin.py b/dltlyse/plugins/sysmem_plugin.py → src/dltlyse/plugins/sysmem_plugin.py
diff --git a/dltlyse/run_dltlyse.py → src/dltlyse/run_dltlyse.py b/dltlyse/run_dltlyse.py → src/dltlyse/run_dltlyse.py
diff --git a/tox.ini b/tox.ini
@@ -6,6 +6,7 @@ envlist = py3
 deps =
     pytest
     six
+    git+https://github.com/bmwcarit/python-dlt
 commands =
     pytest tests/
 
@@ -17,4 +18,4 @@ deps =
 commands =
     black -l 119 --check .
     flake8
-    mypy dltlyse/
+    mypy src/dltlyse/