Improved poetry configuration for keiko and octopoes

.github/workflows/build_docs_on_pr.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: 3.11
           cache: 'pip' # caching pip dependencies
 
       - name: Install pip dependencies

.github/workflows/check_poetry_dependencies.yml

@@ -0,0 +1,38 @@
+name: Check Poetry dependencies
+
+on:
+  push:
+    paths:
+      - requirements.txt
+      - requirements-dev.txt
+      - pyproject.toml
+      - poetry.lock
+  pull_request:
+    paths:
+      - requirements.txt
+      - requirements-dev.txt
+      - pyproject.toml
+      - poetry.lock
+
+
+jobs:
+  poetry-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        id: py311
+        with:
+          python-version: 3.11
+          cache: pip
+
+      - name: Install pip dependencies
+        run: pip install poetry poetry-plugin-export
+
+      - name: Check, lock, and export Poetry dependencies
+        run: make poetry-dependencies
+
+      - name: Check if there are any changed files
+        run: git diff --exit-code

.github/workflows/deploy_docs.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: 3.11
           cache: 'pip' # caching pip dependencies
 
       - name: Install pip dependencies

.github/workflows/pre_commit_checks.yml

@@ -8,20 +8,20 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.8
+      - name: Set up Python
         uses: actions/setup-python@v4
-        id: py38
+        id: py311
         with:
-          python-version: 3.8
+          python-version: 3.11
           cache: pip
 
       - name: Install pip dependencies
-        run: pip install -r requirements-precommit.txt
+        run: pip install -r requirements-dev.txt
 
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
-          key: pre-commit|${{ steps.py38.outputs.python-version }}|${{ hashFiles('.pre-commit-config.yaml') }}
+          key: pre-commit|${{ steps.py311.outputs.python-version }}|${{ hashFiles('.pre-commit-config.yaml') }}
 
       - name: Run pre-commit
         run: pre-commit run --all-files --show-diff-on-failure --color always

Makefile

@@ -98,3 +98,13 @@ ubuntu22.04-build-image:
 
 docs:
 	sphinx-build -b html docs/source docs/_build
+
+poetry-dependencies:
+	for path in . keiko octopoes
+	do
+		echo $$path
+		poetry check -C $$path
+		poetry lock --check -C $$path
+		poetry export -C $$path --without=dev -f requirements.txt -o $$path/requirements.txt
+		poetry export -C $$path --with=dev -f requirements.txt -o $$path/requirements-dev.txt
+	done

keiko/Makefile

@@ -85,8 +85,3 @@ clean:
 	rm -f debian/*.substvars
 	rm -f debian/*.debhelper.log
 	rm -f debian/changelog
-
-export-requirements: ## Export the requirements to requirements.txt format
-	poetry export --output requirements.txt --without-hashes && \
-	poetry export --output requirements-dev.txt --with dev --without-hashes
-	poetry export --output requirements-check.txt --only dev --without-hashes

keiko/pyproject.toml

@@ -1,32 +1,10 @@
 [tool.poetry]
 name = "keiko"
-version = "0.1.0"
+version = "0.0.1.dev1"
 description = "KAT report engine using LateX to generate PDF"
 authors = ["MinVWS <maintainer@openkat.nl>"]
 license = "EUPL"
 
-
-[tool.vulture]
-min_confidence = 90
-paths = ["keiko"]
-
-[tool.pylint.format]
-max-line-length = "120"
-
-[tool.pylint."MESSAGES CONTROL"]
-disable = ["R0914", "R0903"] # Ignore too-many-local-variables; too-few-public-methods
-extension-pkg-whitelist = "pydantic"
-
-[tool.black]
-line-length = 119
-target-version = ['py38']
-
-[tool.pydocstyle]
-
-[tool.mypy]
-python_version = "3.8"
-strict = true
-
 [tool.poetry.dependencies]
 python = "^3.8"
 click = "^8.1.3"

octopoes/Makefile

@@ -77,7 +77,3 @@ rtest-crux:
 	docker-compose -f docker-compose-base.yml -f .ci/docker-compose-crux.yml up -d --build octopoes_api octopoes_api_worker
 	sleep 2
 	robot -d reports --variablefile tests/robot/variables.py:crux tests/robot || :
-
-export-requirements: ## Export the requirements to requirements.txt format
-	poetry export --output requirements.txt --without-hashes
-	poetry export --output requirements-dev.txt --with dev --without-hashes