fix imports and packaging of submodules

tillsteinbach · tillsteinbach · commit bcce239dd80d · 2021-07-26T17:54:23.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.13.1] - 2021-07-26
+### Fixed
+- Packaging of subpackages
+
+### Changed
+- removed relative imports
+
 ## [0.13.0] - 2021-07-26
 ### Added
 - Dummy for maintenance status (currently no data provided, only error messages)
@@ -156,7 +163,8 @@ Minor fix in observer interface
 ## [0.1.0] - 2021-05-26
 Initial release
 
-[unreleased]: https://github.com/tillsteinbach/WeConnect-python/compare/v0.13.0...HEAD
+[unreleased]: https://github.com/tillsteinbach/WeConnect-python/compare/v0.13.1...HEAD
+[0.13.1]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.13.1
 [0.13.0]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.13.0
 [0.12.3]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.12.3
 [0.12.2]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.12.2
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 import pathlib
-from setuptools import setup
+from setuptools import setup, find_packages
 
 # The directory containing this file
 HERE = pathlib.Path(__file__).parent
@@ -11,7 +11,7 @@
 
 setup(
     name='weconnect',
-    packages=['weconnect'],
+    packages=find_packages(),
     version=open("weconnect/__version.py").readlines()[-1].split()[-1].strip("\"'"),
     description='Python API for the Volkswagen WeConnect Services',
     long_description=README,
diff --git a/weconnect/addressable.py b/weconnect/addressable.py
@@ -6,7 +6,7 @@
 from PIL import Image
 import ascii_magic
 
-from .util import toBool, imgToASCIIArt
+from weconnect.util import toBool, imgToASCIIArt
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/access_status.py b/weconnect/elements/access_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableObject, AddressableAttribute, AddressableDict
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableObject, AddressableAttribute, AddressableDict
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/battery_status.py b/weconnect/elements/battery_status.py
@@ -1,7 +1,7 @@
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/capability_status.py b/weconnect/elements/capability_status.py
@@ -1,8 +1,8 @@
 import logging
 
-from ..addressable import AddressableDict
-from ..elements.generic_status import GenericStatus
-from ..elements.generic_capability import GenericCapability
+from weconnect.addressable import AddressableDict
+from weconnect.elements.generic_status import GenericStatus
+from weconnect.elements.generic_capability import GenericCapability
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/charge_mode.py b/weconnect/elements/charge_mode.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/charging_settings.py b/weconnect/elements/charging_settings.py
@@ -1,8 +1,8 @@
 import logging
 
-from ..addressable import AddressableLeaf, ChangeableAttribute
-from ..elements.generic_settings import GenericSettings
-from ..elements.control_operation import ControlInputEnum
+from weconnect.addressable import AddressableLeaf, ChangeableAttribute
+from weconnect.elements.generic_settings import GenericSettings
+from weconnect.elements.control_operation import ControlInputEnum
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/charging_station.py b/weconnect/elements/charging_station.py
@@ -1,8 +1,8 @@
 import logging
 from enum import Enum
 
-from ..util import toBool
-from ..addressable import AddressableObject, AddressableAttribute, AddressableList
+from weconnect.util import toBool
+from weconnect.addressable import AddressableObject, AddressableAttribute, AddressableList
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/charging_status.py b/weconnect/elements/charging_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/climatization_settings.py b/weconnect/elements/climatization_settings.py
@@ -1,8 +1,8 @@
 import logging
 
-from ..addressable import AddressableLeaf, ChangeableAttribute
-from ..elements.generic_settings import GenericSettings
-from ..util import toBool
+from weconnect.addressable import AddressableLeaf, ChangeableAttribute
+from weconnect.elements.generic_settings import GenericSettings
+from weconnect.util import toBool
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/climatization_status.py b/weconnect/elements/climatization_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/climatization_timer.py b/weconnect/elements/climatization_timer.py
@@ -1,9 +1,9 @@
 from datetime import datetime
 import logging
 
-from ..addressable import AddressableObject, AddressableAttribute, AddressableDict
-from ..elements.generic_status import GenericStatus
-from ..util import robustTimeParse, toBool
+from weconnect.addressable import AddressableObject, AddressableAttribute, AddressableDict
+from weconnect.elements.generic_status import GenericStatus
+from weconnect.util import robustTimeParse, toBool
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/controls.py b/weconnect/elements/controls.py
@@ -2,11 +2,11 @@
 import json
 import requests
 
-from ..addressable import AddressableObject, ChangeableAttribute, AddressableLeaf
-from .control_operation import ControlOperation
-from .charging_settings import ChargingSettings
-from .climatization_settings import ClimatizationSettings
-from ..errors import ControlError, SetterError
+from weconnect.addressable import AddressableObject, ChangeableAttribute, AddressableLeaf
+from weconnect.elements.control_operation import ControlOperation
+from weconnect.elements.charging_settings import ChargingSettings
+from weconnect.elements.climatization_settings import ClimatizationSettings
+from weconnect.errors import ControlError, SetterError
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/generic_capability.py b/weconnect/elements/generic_capability.py
@@ -1,8 +1,8 @@
 import logging
 from datetime import datetime
 
-from ..util import robustTimeParse
-from ..addressable import AddressableObject, AddressableAttribute
+from weconnect.util import robustTimeParse
+from weconnect.addressable import AddressableObject, AddressableAttribute
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/generic_request_status.py b/weconnect/elements/generic_request_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/generic_settings.py b/weconnect/elements/generic_settings.py
@@ -4,9 +4,9 @@
 import json
 import requests
 
-from ..addressable import AddressableLeaf, ChangeableAttribute
-from ..elements.generic_status import GenericStatus
-from ..errors import SetterError
+from weconnect.addressable import AddressableLeaf, ChangeableAttribute
+from weconnect.elements.generic_status import GenericStatus
+from weconnect.errors import SetterError
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/generic_status.py b/weconnect/elements/generic_status.py
@@ -2,9 +2,9 @@
 import logging
 from datetime import datetime, timedelta, timezone
 
-from ..util import robustTimeParse, toBool
-from ..addressable import AddressableObject, AddressableAttribute, AddressableList
-from ..elements.control_operation import ControlOperation
+from weconnect.util import robustTimeParse, toBool
+from weconnect.addressable import AddressableObject, AddressableAttribute, AddressableList
+from weconnect.elements.control_operation import ControlOperation
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/lights_status.py b/weconnect/elements/lights_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute, AddressableObject, AddressableDict
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute, AddressableObject, AddressableDict
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/parking_position.py b/weconnect/elements/parking_position.py
@@ -1,7 +1,7 @@
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/plug_status.py b/weconnect/elements/plug_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/range_status.py b/weconnect/elements/range_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute, AddressableObject
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute, AddressableObject
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/vehicle.py b/weconnect/elements/vehicle.py
@@ -8,27 +8,27 @@
 import requests
 from PIL import Image
 
-from ..addressable import AddressableObject, AddressableAttribute, AddressableDict, AddressableList
-from ..elements.generic_capability import GenericCapability
-from ..elements.generic_status import GenericStatus
-from ..elements.generic_request_status import GenericRequestStatus
-from ..elements.controls import Controls
-from ..elements.access_status import AccessStatus
-from ..elements.battery_status import BatteryStatus
-from ..elements.capability_status import CapabilityStatus
-from ..elements.charging_status import ChargingStatus
-from ..elements.charging_settings import ChargingSettings
-from ..elements.charge_mode import ChargeMode
-from ..elements.climatization_status import ClimatizationStatus
-from ..elements.climatization_settings import ClimatizationSettings
-from ..elements.climatization_timer import ClimatizationTimer
-from ..elements.lights_status import LightsStatus
-from ..elements.parking_position import ParkingPosition
-from ..elements.plug_status import PlugStatus
-from ..elements.range_status import RangeStatus
-from ..elements.window_heating_status import WindowHeatingStatus
-from ..errors import APICompatibilityError, RetrievalError
-from ..util import toBool
+from weconnect.addressable import AddressableObject, AddressableAttribute, AddressableDict, AddressableList
+from weconnect.elements.generic_capability import GenericCapability
+from weconnect.elements.generic_status import GenericStatus
+from weconnect.elements.generic_request_status import GenericRequestStatus
+from weconnect.elements.controls import Controls
+from weconnect.elements.access_status import AccessStatus
+from weconnect.elements.battery_status import BatteryStatus
+from weconnect.elements.capability_status import CapabilityStatus
+from weconnect.elements.charging_status import ChargingStatus
+from weconnect.elements.charging_settings import ChargingSettings
+from weconnect.elements.charge_mode import ChargeMode
+from weconnect.elements.climatization_status import ClimatizationStatus
+from weconnect.elements.climatization_settings import ClimatizationSettings
+from weconnect.elements.climatization_timer import ClimatizationTimer
+from weconnect.elements.lights_status import LightsStatus
+from weconnect.elements.parking_position import ParkingPosition
+from weconnect.elements.plug_status import PlugStatus
+from weconnect.elements.range_status import RangeStatus
+from weconnect.elements.window_heating_status import WindowHeatingStatus
+from weconnect.errors import APICompatibilityError, RetrievalError
+from weconnect.util import toBool
 
 LOG = logging.getLogger("weconnect")
 
diff --git a/weconnect/elements/window_heating_status.py b/weconnect/elements/window_heating_status.py
@@ -1,8 +1,8 @@
 from enum import Enum
 import logging
 
-from ..addressable import AddressableAttribute, AddressableDict, AddressableObject
-from ..elements.generic_status import GenericStatus
+from weconnect.addressable import AddressableAttribute, AddressableDict, AddressableObject
+from weconnect.elements.generic_status import GenericStatus
 
 LOG = logging.getLogger("weconnect")
 
