Merge pull request #426 from GeoDerp/custom_cec

WIP emhass csv append modules and fix inverters syntax and semantics
davidusb-geek · Jan 26, 2025 · 03eed89 · 03eed89
2 parents 11e80c3 + f97bfc2
commit 03eed89
Show file tree

Hide file tree

Showing 34 changed files with 1,039 additions and 415 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,10 +9,8 @@
 	},
 	"features": {
 		"ghcr.io/devcontainers/features/common-utils:2": {
-			"installZsh": "true",
-			"configureZshAsDefaultShell": "true",
-			"installOhMyZsh": "false",
-			"installOhMyZshConfig": "false"
+			"installBash": "true",
+			"configureBashAsDefaultShell": "true"
 		}
 		// "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
 	},
@@ -46,6 +44,6 @@
 		}
 	  },
 
-	"postCreateCommand": ["pip3", "install", "--break-system-packages" , ".[test]"]
+	"postCreateCommand": ["uv", "pip", "install", "--cache-dir", ".cache", "--verbose", ".[test]"]
 
 }
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -16,14 +16,16 @@ jobs:
       PYTHON: '3.11'
     steps:
     - uses: actions/checkout@master
-    - name: Setup Python
-      uses: actions/setup-python@master
+    - name: Install uv
+        uses: astral-sh/setup-uv@v5
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.11
+        python-version-file: ".python-version"
     - name: Generate Report
       run: |
-        python -m pip install --upgrade pip
-        pip install .[test]
+        uv venv
+        uv pip install .[test]
         coverage run -m --source=emhass unittest
         coverage report
         coverage xml

diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml
@@ -50,7 +50,7 @@ jobs:
       - name: Export Debian package list
         run: mkdir OSV && docker run --rm --entrypoint '/bin/cat' ${{ steps.build.outputs.imageid }} /var/lib/dpkg/status >> ./OSV/${{ matrix.platform.target_arch }}.status
       - name: Export Python package list
-        run: docker run --rm --entrypoint '/usr/bin/pip3' ${{ steps.build.outputs.imageid }} freeze >> ./OSV/${{ matrix.platform.target_arch }}-requirements.txt
+        run: docker run --rm --entrypoint '/bin/cat' ${{ steps.build.outputs.imageid }} uv.lock >> ./OSV/${{ matrix.platform.target_arch }}.lock
       - name: Upload package list as digest
         uses: actions/upload-artifact@v4
         with:
@@ -77,10 +77,10 @@ jobs:
     with:
       download-artifact: "${{ matrix.platform.target_arch }}-packages"
       matrix-property: "${{ matrix.platform.target_arch }}-"
+      fail-on-vuln: false
       scan-args: |-
         --lockfile=dpkg-status:./${{ matrix.platform.target_arch }}.status
-        --lockfile=requirements.txt:./${{matrix.platform.target_arch }}-requirements.txt
-        --fail-on-vuln: false
+        --lockfile=poetry.lock:./${{matrix.platform.target_arch }}.lock
     permissions:
       security-events: write
       contents: read

diff --git a/.github/workflows/publish_docker-test.yaml b/.github/workflows/publish_docker-test.yaml
@@ -4,7 +4,7 @@ name: "Publish Docker test image"
 
 on:
   push:
-    branches: [master]
+    branches: [testing]
   workflow_dispatch:
 
 env:
@@ -62,7 +62,7 @@ jobs:
       - name: Export Debian package list
         run: mkdir OSV && docker run --rm --entrypoint '/bin/cat' ${{ steps.cache.outputs.imageid }} /var/lib/dpkg/status >> ./OSV/${{ matrix.platform.target_arch }}.status
       - name: Export Python package list
-        run: docker run --rm --entrypoint '/usr/bin/pip3' ${{ steps.cache.outputs.imageid }} freeze >> ./OSV/${{ matrix.platform.target_arch }}-requirements.txt
+        run: docker run --rm --entrypoint '/bin/cat' ${{ steps.cache.outputs.imageid }} uv.lock >> ./OSV/${{ matrix.platform.target_arch }}.lock
       - name: Upload package list as digest
         uses: actions/upload-artifact@v4
         with:
@@ -120,10 +120,10 @@ jobs:
     with:
       download-artifact: "${{ matrix.platform.target_arch }}-packages"
       matrix-property: "${{ matrix.platform.target_arch }}-"
+      fail-on-vuln: false
       scan-args: |-
         --lockfile=dpkg-status:./${{ matrix.platform.target_arch }}.status
-        --lockfile=requirements.txt:./${{matrix.platform.target_arch }}-requirements.txt
-        --fail-on-vuln: false
+        --lockfile=poetry.lock:./${{matrix.platform.target_arch }}.lock
     permissions:
       security-events: write
       contents: read

diff --git a/.github/workflows/publish_docker.yaml b/.github/workflows/publish_docker.yaml
@@ -61,7 +61,7 @@ jobs:
       - name: Export Debian package list
         run: mkdir OSV && docker run --rm --entrypoint '/bin/cat' ${{ steps.cache.outputs.imageid }} /var/lib/dpkg/status >> ./OSV/${{ matrix.platform.target_arch }}.status
       - name: Export Python package list
-        run: docker run --rm --entrypoint '/usr/bin/pip3' ${{ steps.cache.outputs.imageid }} freeze >> ./OSV/${{ matrix.platform.target_arch }}-requirements.txt
+        run: docker run --rm --entrypoint '/bin/cat' ${{ steps.cache.outputs.imageid }} uv.lock >> ./OSV/${{ matrix.platform.target_arch }}.lock
       - name: Upload package list as digest
         uses: actions/upload-artifact@v4
         with:
@@ -119,10 +119,10 @@ jobs:
     with:
       download-artifact: "${{ matrix.platform.target_arch }}-packages"
       matrix-property: "${{ matrix.platform.target_arch }}-"
+      fail-on-vuln: false
       scan-args: |-
         --lockfile=dpkg-status:./${{ matrix.platform.target_arch }}.status
-        --lockfile=requirements.txt:./${{matrix.platform.target_arch }}-requirements.txt
-        --fail-on-vuln: false
+        --lockfile=poetry.lock:./${{matrix.platform.target_arch }}.lock
     permissions:
       security-events: write
       contents: read

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -12,20 +12,8 @@ permissions:
 
 jobs:
   # Google OSV-Scanner
-  scan-pr:
-    uses: "geoderp/osv-scanner-action/.github/workflows/[email protected]"
-    with:
-      scan-args: |-
-        --recursive
-        ./
-    permissions:
-      security-events: write
-      contents: read
-      actions: read
   build:
     runs-on: ${{ matrix.os }}
-    needs:
-      - scan-pr
     strategy:
       fail-fast: false
       matrix:
@@ -37,23 +25,36 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
-
+          python-version-file: ".python-version"
+      - name: Set up Python venv
+        run: uv venv
       - name: Special dependencies for macos
         run: |
           brew install hdf5
-          pip3 install numpy==1.26.0
-          pip3 install tables==3.9.1
+          uv pip install numpy==1.26.0
+          uv pip install tables==3.9.1
         if: ${{ matrix.os == 'macos-latest' }}
-
       - name: Install EMHASS with test dependencies
         run: |
-          pip install .[test]
-
+          uv pip install .[test] && uv lock
       - name: Test with pytest
         run: |
-          pytest
+           uv run pytest
+  scan-pr:
+    needs:
+      - build
+    uses: "geoderp/osv-scanner-action/.github/workflows/[email protected]"
+    with:
+      fail-on-vuln: false
+      scan-args: |-
+        --recursive
+        ./
+    permissions:
+      security-events: write
+      contents: read
+      actions: read
diff --git a/.github/workflows/upload-package-to-pypi.yaml b/.github/workflows/upload-package-to-pypi.yaml
@@ -7,40 +7,40 @@ on:
 
 jobs:
   # Google OSV-Scanner  
-  osv-scan:
-    uses: "geoderp/osv-scanner-action/.github/workflows/[email protected]"
-    with:
-      scan-args: |-
-        --recursive
-        ./
-    permissions:
-      security-events: write
-      contents: read
-      actions: read
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Python
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+    - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.11
-    - name: Install pypa/build
-      run: >-
-        python3 -m pip install build --user
+        python-version-file: ".python-version"
     - name: Build a binary wheel and a source tarball
-      run: python3 -m build
+      run: uv build
     - name: Store the distribution packages
       uses: actions/upload-artifact@v4
       with:
         name: python-package-distributions
         path: dist/
+  osv-scan:
+    uses: "geoderp/osv-scanner-action/.github/workflows/[email protected]"
+    needs:
+    - build
+    with:
+      scan-args: |-
+        --recursive
+        ./
+    permissions:
+      security-events: write
+      contents: read
+      actions: read
   publish-to-pypi:
     name: >-
       Publish Python 🐍 distribution 📦 to PyPI
     needs:
     - osv-scan
-    - build
     runs-on: ubuntu-latest
     environment:
       name: pypi

diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ data/entities/*.json
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
+uv.lock
 
 # Unit test / coverage reports
 htmlcov/

diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.11
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,7 @@
     ],
     "python.testing.pytestEnabled": false,
     "python.testing.unittestEnabled": true,
+    "python.defaultInterpreterPath": ".venv/bin/python",
     "cSpell.words": [
         "automations"
     ]

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,18 +3,13 @@
     "tasks": [
         {
             "label": "EMHASS install",
-            "command": "pip3",
+            "command": "uv",
             "group": {
                 "kind": "build",
                 "isDefault": true
             },
             "args": [
-                "install",
-                "--no-deps",
-                "--force-reinstall",
-                "--break-system-packages",
-                "--editable",
-                "."
+                "pip", "install", "--force-reinstall", ".[test]"
             ],
             "presentation": {
                 "echo": true,
@@ -24,13 +19,13 @@
         },
         {
             "label": "EMHASS install with dependencies",
-            "command": "pip3",
+            "command": "uv",
             "group": {
                 "kind": "build",
                 "isDefault": true
             },
             "args": [
-                "install", "--break-system-packages", "--force-reinstall", "."
+                "pip", "install", "--reinstall", ".[test]"
             ],
             "presentation": {
                 "echo": true,