volkswagencarnet 5.0.0b1__tar.gz → 5.3.3__tar.gz

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/.github/workflows/codeql-analysis.yml

@@ -26,15 +26,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: security-and-quality
@@ -45,4 +45,4 @@ jobs:
 
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/.github/workflows/release.yaml

@@ -14,10 +14,10 @@ jobs:
       id-token: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/.github/workflows/snyk.yaml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Run Snyk to check for vulnerabilities
         uses: snyk/actions/python@master
@@ -17,6 +17,6 @@ jobs:
           args: --sarif-file-output=snyk.sarif
 
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: snyk.sarif

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/.github/workflows/testrelease.yaml

@@ -14,10 +14,10 @@ jobs:
       id-token: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/.github/workflows/validate.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check ruff
         uses: chartboost/ruff-action@v1
@@ -36,12 +36,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: volkswagencarnet
-Version: 5.0.0b1
+Version: 5.3.3
 Summary: Communicate with Volkswagen Connect
 Home-page: https://github.com/robinostlund/volkswagencarnet
 Author: Robin Ostlund
@@ -17,11 +17,14 @@ Requires-Dist: lxml
 Requires-Dist: beautifulsoup4
 Requires-Dist: aiohttp
 Requires-Dist: pyjwt
+Dynamic: license-file
 
 # Volkswagen Carnet
 
 [![buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/robinostlund)
 
+[![buy me a coffee](https://raw.githubusercontent.com/robinostlund/homeassistant-volkswagencarnet/master/resources/stickpin_kofi.jpeg)](https://ko-fi.com/stickpin)
+
 ![Release](https://img.shields.io/github/workflow/status/robinostlund/volkswagencarnet/Release)
 ![PyPi](https://img.shields.io/pypi/v/volkswagencarnet)
 ![Version](https://img.shields.io/github/v/release/robinostlund/volkswagencarnet)
@@ -47,6 +50,7 @@ No licence, public domain, no guarantees, feel free to use for anything. Please
 
 ## Thanks to
 
+- [stickpin](https://github.com/stickpin)
 - [Wez3](https://github.com/wez3)
 - [Reneboer](https://github.com/reneboer)
 - [Tubalainen](https://github.com/tubalainen)
@@ -124,7 +128,12 @@ RESOURCES = [
     'trip_last_average_electric_consumption',
     'trip_last_average_fuel_consumption',
     'trip_last_duration',
-    'trip_last_length'
+    'trip_last_length',
+    'trip_refuel_average_speed',
+    'trip_refuel_average_electric_consumption',
+    'trip_refuel_average_fuel_consumption',
+    'trip_refuel_duration',
+    'trip_refuel_length'
 ]
 
 def is_enabled(attr):

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/README.md

@@ -2,6 +2,8 @@
 
 [![buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/robinostlund)
 
+[![buy me a coffee](https://raw.githubusercontent.com/robinostlund/homeassistant-volkswagencarnet/master/resources/stickpin_kofi.jpeg)](https://ko-fi.com/stickpin)
+
 ![Release](https://img.shields.io/github/workflow/status/robinostlund/volkswagencarnet/Release)
 ![PyPi](https://img.shields.io/pypi/v/volkswagencarnet)
 ![Version](https://img.shields.io/github/v/release/robinostlund/volkswagencarnet)
@@ -27,6 +29,7 @@ No licence, public domain, no guarantees, feel free to use for anything. Please
 
 ## Thanks to
 
+- [stickpin](https://github.com/stickpin)
 - [Wez3](https://github.com/wez3)
 - [Reneboer](https://github.com/reneboer)
 - [Tubalainen](https://github.com/tubalainen)
@@ -104,7 +107,12 @@ RESOURCES = [
     'trip_last_average_electric_consumption',
     'trip_last_average_fuel_consumption',
     'trip_last_duration',
-    'trip_last_length'
+    'trip_last_length',
+    'trip_refuel_average_speed',
+    'trip_refuel_average_electric_consumption',
+    'trip_refuel_average_fuel_consumption',
+    'trip_refuel_duration',
+    'trip_refuel_length'
 ]
 
 def is_enabled(attr):

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/requirements.txt

@@ -1,5 +1,4 @@
 aiohttp
 beautifulsoup4
-cryptography
 lxml
 pyjwt

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/credentials.py.sample

@@ -2,5 +2,5 @@
 # Oh, and replace the data in credentials.py with your own
 spin = '1234'
 username = 'john.doe@localhost.localnet'
-pasword = 'passw0rd'
+password = 'passw0rd'
 vin = 'WVWZZXXXXX1234567'

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/fixtures/connection.py

@@ -29,5 +29,4 @@ def connection(session):
         password="",
         country="DE",
         interval=999,
-        fulldebug=True,
     )

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/integration_test.py

@@ -11,7 +11,7 @@ import pytest
 from volkswagencarnet import vw_connection
 
 try:
-    from credentials import password, spin, username, vin
+    from tests.credentials import password, spin, username, vin
 except ImportError:
     username = password = spin = vin = None
 

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/vw_connection_test.py

@@ -21,7 +21,6 @@ class TwoVehiclesConnection(Connection):
     def __init__(self, sess, username="", password="", **kwargs):
         """Init."""
         super().__init__(session=sess, username=username, password=password)
-        self._jarCookie = MagicMock()
 
     async def doLogin(self, tries=1):
         """No-op update."""

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/vw_utilities_test.py

@@ -52,16 +52,16 @@ class UtilitiesTest(TestCase):
 
                 if isinstance(expected, bool):
                     # If expected is a boolean, assert the result of is_valid_path
-                    assert (
-                        is_valid_path(source, path) == expected
-                    ), f"Path validation error for '{path}' in '{source}'."
+                    assert is_valid_path(source, path) == expected, (
+                        f"Path validation error for '{path}' in '{source}'."
+                    )
                 else:
                     # If expected is an exception, assert it is raised
                     with pytest.raises(expected) as exc_info:
                         is_valid_path(source, path)
-                    assert isinstance(
-                        exc_info.value, expected
-                    ), f"Expected {expected.__name__}, but got {type(exc_info.value).__name__}. Exception: {str(exc_info.value)}"
+                    assert isinstance(exc_info.value, expected), (
+                        f"Expected {expected.__name__}, but got {type(exc_info.value).__name__}. Exception: {str(exc_info.value)}"
+                    )
 
     def test_is_valid_path_with_lists(self):
         """Test that is_valid_path can process lists."""

{volkswagencarnet-5.0.0b1 → volkswagencarnet-5.3.3}/tests/vw_vehicle_test.py

@@ -57,6 +57,7 @@ class VehicleTest(IsolatedAsyncioTestCase):
                 Services.MEASUREMENTS: {"active": False},
                 Services.PARKING_POSITION: {"active": False},
                 Services.TRIP_STATISTICS: {"active": False},
+                Services.READINESS: {"active": False},
                 Services.USER_CAPABILITIES: {"active": False},
                 Services.PARAMETERS: {},
             }
@@ -84,9 +85,9 @@ class VehicleTest(IsolatedAsyncioTestCase):
 
         vehicle.discover.assert_not_called()
         # Verify that no other methods were called
-        assert (
-            len(vehicle.method_calls) == 0
-        ), f"Expected none, got {vehicle.method_calls}"
+        assert len(vehicle.method_calls) == 0, (
+            f"Expected none, got {vehicle.method_calls}"
+        )
 
     async def test_update(self):
         """Test that update calls the wanted methods and nothing else."""
@@ -105,9 +106,9 @@ class VehicleTest(IsolatedAsyncioTestCase):
         vehicle.get_service_status.assert_called_once()
 
         # Verify that only the expected functions above were called
-        assert (
-            len(vehicle.method_calls) == 6
-        ), f"Wrong number of methods called. Expected 6, got {len(vehicle.method_calls)}"
+        assert len(vehicle.method_calls) == 8, (
+            f"Wrong number of methods called. Expected 8, got {len(vehicle.method_calls)}"
+        )
 
 
 class VehiclePropertyTest(IsolatedAsyncioTestCase):

volkswagencarnet-5.3.3/volkswagencarnet/version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '5.3.3'
+__version_tuple__ = version_tuple = (5, 3, 3)
+
+__commit_id__ = commit_id = 'gb78fabeb8'