Merge pull request #482 from MyElectricalData/vingerha-main

chore: clean

.github/workflows/semantic_prerelease.yaml

@@ -9,5 +9,3 @@ jobs:
 
   Semantic-Pre-Release:
     uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main
-    with:
-      PRE_RELEASE: true

.github/workflows/semantic_release.yaml

@@ -6,6 +6,4 @@ on:
 jobs:
 
   Semantic-Release:
-    uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main
-    with:
-      PRE_RELEASE: false
+    uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main

.gitignore

@@ -9,4 +9,4 @@ data
 .pytest_cache
 .coverage
 .tox
-**/__pycache__/
+**/__pycache__/

Makefile

@@ -8,9 +8,9 @@ define title
 @/bin/echo -e "\n------------------------------------------------\n${1}\n------------------------------------------------\n"
 endef
 define poetry
-$(call title, ${2})
-touch .env
-poetry run -vvv ${1}
+	$(call title, ${2})
+	touch .env
+	~/.asdf/shims/poetry run -vvv ${1}
 endef
 
 check: check_asdf
@@ -108,11 +108,11 @@ debug: init enable_debug up bootstrap down
 
 ## Start all external ressource necessary to debug (MQTT, InfluxDB,...)
 up:
-	docker compose -f dev/docker-compose.dev.yaml start
+	cd dev; docker compose up --force-recreate --detach; cd -
 
 ## Stop all external ressource necessary to debug (MQTT, InfluxDB,...)
 down:
-	docker compose -f dev/docker-compose.dev.yaml stop
+	docker compose down
 
 ## Run PyTest only
 test: pytest

pyproject.toml

@@ -75,9 +75,13 @@ version_variables = [
 ]
 
 [tool.semantic_release.branches.main]
-match = "(main|master|feat/poetry)"
-prerelease_token = "rc"
+match = "(main|master)"
+prerelease = false
+
+[tool.semantic_release.branches."*"]
+match = ".*"
 prerelease = true
+prerelease_token = "rc"
 
 [tool.semantic_release.changelog]
 template_dir = "templates"

src/models/stat.py

@@ -604,7 +604,7 @@ def get_week(self, year, month=None, measure_type=None):
         now_date = datetime.now(timezone.utc)
         if month is None:
             month = int(datetime.now().strftime("%m"))
-        #adapt for day in leap-year
+        # adapt for day in leap-year
         if datetime.now().strftime("%m%d") == "0229" and int(year) != int(datetime.now().strftime("%Y")):
             today = date.today() + timedelta(days=1)
         else: