From 9caa7a71249b2f60d837dd18de05892a9e809913 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:07:47 +0100
Subject: [PATCH] use venv

---
 .github/workflows/build.yml                         | 13 ++++++-------
 .gitignore                                          |  4 ++--
 docker/image/Dockerfile                             |  8 +++-----
 pdm.lock                                            |  2 +-
 pyinstaller.spec                                    |  2 +-
 pyproject.toml                                      |  4 ++--
 .../kleinanzeigen_bot}/__init__.py                  |  0
 .../kleinanzeigen_bot}/__main__.py                  |  0
 .../kleinanzeigen_bot}/extract.py                   |  0
 .../kleinanzeigen_bot}/resources/__init__.py        |  0
 .../kleinanzeigen_bot}/resources/ad_fields.yaml     |  0
 .../kleinanzeigen_bot}/resources/categories.yaml    |  0
 .../resources/config_defaults.yaml                  |  0
 .../kleinanzeigen_bot}/selenium_mixin.py            |  0
 .../kleinanzeigen_bot}/utils.py                     |  0
 15 files changed, 15 insertions(+), 18 deletions(-)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/__init__.py (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/__main__.py (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/extract.py (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/resources/__init__.py (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/resources/ad_fields.yaml (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/resources/categories.yaml (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/resources/config_defaults.yaml (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/selenium_mixin.py (100%)
 rename {kleinanzeigen_bot => src/kleinanzeigen_bot}/utils.py (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c67fbc..ad4543b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,15 +85,11 @@ jobs:
         fi
 
 
-    - uses: actions/setup-python@v5
+    - name: "Install Python and PDM"  #         https://github.com/pdm-project/setup-pdm
+      uses: pdm-project/setup-pdm@v3
       with:
         python-version: "${{ matrix.PYTHON_VERSION }}"
-
-
-    - uses: actions/cache@v4
-      with:
-        path: __pypackages__
-        key: ${{ runner.os }}-pypackages-${{ hashFiles('pdm.lock') }}
+        cache: true
 
 
     - name: "Install: Python dependencies"
@@ -103,6 +99,9 @@ jobs:
         python --version
         python -m pip install --upgrade pip
         pip install --upgrade pdm
+        if [[ ! -e .venv ]]; then
+          pdm venv create || true
+        fi
         pdm install -v
 
 
diff --git a/.gitignore b/.gitignore
index 9f31235..eb30af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,11 @@ _LOCAL/
 /config.yaml
 /data
 /*.log
-kleinanzeigen_bot/_version.py
+/src/kleinanzeigen_bot/_version.py
 downloaded-ads
 
 # python
-/__pypackages__
+/.venv
 __pycache__
 /build
 /dist
diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile
index de384b4..c8cbe25 100644
--- a/docker/image/Dockerfile
+++ b/docker/image/Dockerfile
@@ -60,7 +60,7 @@ RUN <<EOF
     git `# required by pdm to generate app version` \
 
   # upgrade pip
-  python -m pip install --upgrade pip \
+  python -m pip install --upgrade pip
 
   # install pdm
   pip install pdm
@@ -69,16 +69,14 @@ EOF
 
 ENV PATH="/opt/upx:${PATH}"
 
-COPY kleinanzeigen_bot /opt/app/kleinanzeigen_bot
-COPY .git /opt/app/.git
-COPY README.md pdm.lock pyinstaller.spec pyproject.toml version.py /opt/app/
+COPY . /opt/app/
 
 RUN <<EOF
 
   cd /opt/app
   ls -la .
   pdm install -v
-  ls -la kleinanzeigen_bot
+  ls -la src/kleinanzeigen_bot
   pdm run compile
   ls -l dist
 
diff --git a/pdm.lock b/pdm.lock
index be4d60d..9ce52e5 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -4,7 +4,7 @@
 [metadata]
 groups = ["default", "dev"]
 strategy = ["cross_platform"]
-lock_version = "4.4"
+lock_version = "4.4.1"
 content_hash = "sha256:710d12dd05635102f9a19f332ace367f6fbc903fe2f780a1fc017aca023e0e1f"
 
 [[package]]
diff --git a/pyinstaller.spec b/pyinstaller.spec
index 8b01a97..35ce947 100644
--- a/pyinstaller.spec
+++ b/pyinstaller.spec
@@ -47,7 +47,7 @@ if platform != "darwin":
 
 # https://github.com/pyinstaller/pyinstaller/blob/f563dce1e83fd5ec72a20dffd2ac24be3e647150/PyInstaller/building/build_main.py#L320
 analysis = Analysis(
-        ['kleinanzeigen_bot/__main__.py'],
+        ['src/kleinanzeigen_bot/__main__.py'],
         # pathex = [],
         # binaries = [],
         datas = datas,
diff --git a/pyproject.toml b/pyproject.toml
index 68c18cd..1825fa0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ app     = "python -m kleinanzeigen_bot"
 compile.cmd = "python -O -m PyInstaller pyinstaller.spec --clean"
 compile.env = {PYTHONHASHSEED = "1", SOURCE_DATE_EPOCH = "0"} # https://pyinstaller.org/en/stable/advanced-topics.html#creating-a-reproducible-build
 format  = "autopep8 --recursive --in-place kleinanzeigen_bot tests --verbose"
-lint    = {shell = "pylint -v kleinanzeigen_bot tests && autopep8 -v --exit-code --recursive --diff kleinanzeigen_bot tests && echo No issues found."}
+lint    = {shell = "pylint -v src tests && autopep8 -v --exit-code --recursive --diff src tests && echo No issues found."}
 scan    = "bandit -c pyproject.toml -r kleinanzeigen_bot"
 test    = "python -m pytest --capture=tee-sys -v"
 utest   = "python -m pytest --capture=tee-sys -v -m 'not itest'"
@@ -215,7 +215,7 @@ max-public-methods = 30 # maximum number of public methods for a class (R0904)
 #####################
 [tool.pytest.ini_options]
 # https://docs.pytest.org/en/stable/reference.html#confval-addopts
-addopts = "--strict-markers -p no:cacheprovider --doctest-modules --ignore=__pypackages__ --ignore=kleinanzeigen_bot/__main__.py"
+addopts = "--strict-markers -p no:cacheprovider --doctest-modules --ignore=kleinanzeigen_bot/__main__.py"
 markers = [
     "itest: marks a test as an integration test (i.e. a test with external dependencies)"
 ]
diff --git a/kleinanzeigen_bot/__init__.py b/src/kleinanzeigen_bot/__init__.py
similarity index 100%
rename from kleinanzeigen_bot/__init__.py
rename to src/kleinanzeigen_bot/__init__.py
diff --git a/kleinanzeigen_bot/__main__.py b/src/kleinanzeigen_bot/__main__.py
similarity index 100%
rename from kleinanzeigen_bot/__main__.py
rename to src/kleinanzeigen_bot/__main__.py
diff --git a/kleinanzeigen_bot/extract.py b/src/kleinanzeigen_bot/extract.py
similarity index 100%
rename from kleinanzeigen_bot/extract.py
rename to src/kleinanzeigen_bot/extract.py
diff --git a/kleinanzeigen_bot/resources/__init__.py b/src/kleinanzeigen_bot/resources/__init__.py
similarity index 100%
rename from kleinanzeigen_bot/resources/__init__.py
rename to src/kleinanzeigen_bot/resources/__init__.py
diff --git a/kleinanzeigen_bot/resources/ad_fields.yaml b/src/kleinanzeigen_bot/resources/ad_fields.yaml
similarity index 100%
rename from kleinanzeigen_bot/resources/ad_fields.yaml
rename to src/kleinanzeigen_bot/resources/ad_fields.yaml
diff --git a/kleinanzeigen_bot/resources/categories.yaml b/src/kleinanzeigen_bot/resources/categories.yaml
similarity index 100%
rename from kleinanzeigen_bot/resources/categories.yaml
rename to src/kleinanzeigen_bot/resources/categories.yaml
diff --git a/kleinanzeigen_bot/resources/config_defaults.yaml b/src/kleinanzeigen_bot/resources/config_defaults.yaml
similarity index 100%
rename from kleinanzeigen_bot/resources/config_defaults.yaml
rename to src/kleinanzeigen_bot/resources/config_defaults.yaml
diff --git a/kleinanzeigen_bot/selenium_mixin.py b/src/kleinanzeigen_bot/selenium_mixin.py
similarity index 100%
rename from kleinanzeigen_bot/selenium_mixin.py
rename to src/kleinanzeigen_bot/selenium_mixin.py
diff --git a/kleinanzeigen_bot/utils.py b/src/kleinanzeigen_bot/utils.py
similarity index 100%
rename from kleinanzeigen_bot/utils.py
rename to src/kleinanzeigen_bot/utils.py