From 7eab066df0761e1709f8ec20a479625a3f4c5178 Mon Sep 17 00:00:00 2001
From: Ray Kinsella <mdr@ashroe.eu>
Date: Tue, 3 Sep 2024 08:30:27 +0000
Subject: [PATCH 1/2] Added support for setuptools-git-versioning

Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
---
 requirements.txt |  2 ++
 setup.py         | 17 +++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f229360..19ebd16 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,3 @@
 requests
+setuptools >= 74.1.0
+setuptools_git_versioning >= 2.0.0
diff --git a/setup.py b/setup.py
index 50394eb..52052bd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,12 @@
 import sys
-from setuptools import setup
+import setuptools
 from pathlib import Path
 
 # read the contents of your README file
 current_directory = Path(__file__).parent
 long_description = (current_directory / "README.md").read_text()
 
-version = sys.argv[3:]
-if version:
-    version = str(version[0])
-    sys.argv.remove(version)
-else:
-    raise Exception("Version is not set")
-
-setup(
+setuptools.setup(
     name="ThermiaOnlineAPI",
     packages=[
         "ThermiaOnlineAPI",
@@ -22,7 +15,10 @@
         "ThermiaOnlineAPI.model",
         "ThermiaOnlineAPI.utils",
     ],
-    version=version,
+    setuptools_git_versioning={
+        "enabled": True,
+        "dev_template": "{tag}", 
+    },
     license="GPL-3.0",
     description="A Python API for Thermia heat pumps using https://online.thermia.se",
     long_description=long_description,
@@ -33,5 +29,6 @@
     download_url="https://github.com/klejejs/python-thermia-online-api/releases",
     keywords=["Thermia", "Online"],
     install_requires=[],
+    setup_requires=["setuptools-git-versioning"],
     classifiers=[],
 )

From d51cbe9c2507e4bcd8df0b17b1bf8116422584cf Mon Sep 17 00:00:00 2001
From: Krisjanis Lejejs <krisjanis.lejejs@gmail.com>
Date: Wed, 4 Sep 2024 00:59:43 +0300
Subject: [PATCH 2/2] Fix GitHub release pipeline

---
 .github/workflows/publish-release-to-pypi.yaml | 9 ++++-----
 requirements.txt                               | 4 +---
 requirements_release.txt                       | 4 ++++
 setup.py                                       | 3 +--
 4 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 requirements_release.txt

diff --git a/.github/workflows/publish-release-to-pypi.yaml b/.github/workflows/publish-release-to-pypi.yaml
index 7e5cd76..42991d0 100644
--- a/.github/workflows/publish-release-to-pypi.yaml
+++ b/.github/workflows/publish-release-to-pypi.yaml
@@ -20,16 +20,15 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: "3.x"
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -U setuptools wheel twine
+          pip install -U -r requirements_release.txt
       - name: Build and publish release
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          if [ -z ${{ github.event.inputs.version }} ]; then VERSION=${{ github.event.release.tag_name }}; else VERSION=${{ github.event.inputs.version }}; fi
-          python setup.py sdist bdist_wheel $VERSION
-          twine upload dist/*
\ No newline at end of file
+          python setup.py sdist bdist_wheel
+          twine upload dist/*
diff --git a/requirements.txt b/requirements.txt
index 19ebd16..822cd79 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1 @@
-requests
-setuptools >= 74.1.0
-setuptools_git_versioning >= 2.0.0
+requests >= 2.32.3
diff --git a/requirements_release.txt b/requirements_release.txt
new file mode 100644
index 0000000..fb4e241
--- /dev/null
+++ b/requirements_release.txt
@@ -0,0 +1,4 @@
+setuptools >= 74.1.0
+setuptools_git_versioning >= 2.0.0
+twine >= 5.1.1
+wheel >= 0.44.0
diff --git a/setup.py b/setup.py
index 52052bd..208a1f1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-import sys
 import setuptools
 from pathlib import Path
 
@@ -17,7 +16,7 @@
     ],
     setuptools_git_versioning={
         "enabled": True,
-        "dev_template": "{tag}", 
+        "dev_template": "{tag}",
     },
     license="GPL-3.0",
     description="A Python API for Thermia heat pumps using https://online.thermia.se",