From 1997957069c6bd8be1f63d4c9f92edd871a47613 Mon Sep 17 00:00:00 2001
From: Thomas Peetz <thomas.peetz@ingenieurbuero-peetz.de>
Date: Fri, 18 Apr 2025 00:52:00 +0200
Subject: [PATCH] remove .itlab-ci.yml and call of pytest to Makefile

---
 .gitlab-ci.yml                       | 36 ----------------------------
 fastapi/Makefile                     |  7 +-----
 fastapi/{app => }/tests/__init__.py  |  0
 fastapi/{app => }/tests/test_main.py |  0
 4 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 rename fastapi/{app => }/tests/__init__.py (100%)
 rename fastapi/{app => }/tests/test_main.py (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 7231f34..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-image: gradle:8.6-jdk21-alpine
-
-stages:
-    - build
-    - test
-    - publish
-
-# Disable the Gradle daemon for Continuous Integration servers as correctness
-# is usually a priority over speed in CI environments. Using a fresh
-# runtime for each build is more reliable since the runtime is completely
-# isolated from any previous builds.
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-
-before_script:
-  - GRADLE_USER_HOME="$(pwd)/.gradle"
-  - export GRADLE_USER_HOME
-
-build:
-  stage: build
-  script: 
-    - cd springboot
-    - gradle assemble --no-daemon
-
-test:
-  stage: test
-  script:
-    - cd springboot
-    - gradle check --no-daemon
-
-publish:
-  stage: publish
-  script:
-    - cd springboot
-    - gradle --no-daemon publish -PgitlabPackageRegistryUsername=gitlab-ci-token -PgitlabPackageRegistryPassword="$CI_JOB_TOKEN"
-
diff --git a/fastapi/Makefile b/fastapi/Makefile
index 2031118..5c1c393 100644
--- a/fastapi/Makefile
+++ b/fastapi/Makefile
@@ -12,12 +12,7 @@ virtualenv:
 	@echo
 
 test:
-	python -m pytest \
-		-v \
-		--cov=kontor \
-		--cov-report=term \
-		--cov-report=html:coverage-report \
-		tests/
+	pytest -v --cov --cov-report=term --cov-report=html:coverage-report
 
 docker: clean
 	docker build -t kontor-api:latest .
diff --git a/fastapi/app/tests/__init__.py b/fastapi/tests/__init__.py
similarity index 100%
rename from fastapi/app/tests/__init__.py
rename to fastapi/tests/__init__.py
diff --git a/fastapi/app/tests/test_main.py b/fastapi/tests/test_main.py
similarity index 100%
rename from fastapi/app/tests/test_main.py
rename to fastapi/tests/test_main.py