diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8e6d253a..4a5f7e8c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.9.1 +current_version = 0.9.2 commit = True tag = False diff --git a/CHANGELOG.md b/CHANGELOG.md index 788ce93a..827f325d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Revision Change History +## [0.9.2] + +## Hotfix + +- Allows the use of domain names for the broker and hub addresses. I created a + bug in 0.9.1, my fault for thinking of this. ([PR 404][P404]) + +## Fixes + +- Adjusts the docker build script to one that works. ([PR 402][P402]) + ## [0.9.1] ### Additions @@ -729,3 +740,5 @@ will add new features. [P397]: https://github.com/TD22057/insteon-mqtt/pull/397 [P399]: https://github.com/TD22057/insteon-mqtt/pull/399 [P400]: https://github.com/TD22057/insteon-mqtt/pull/400 +[P404]: https://github.com/TD22057/insteon-mqtt/pull/404 +[P402]: https://github.com/TD22057/insteon-mqtt/pull/402 diff --git a/README.md b/README.md index 5eb15158..20c83855 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ integrated into and controlled from anything that can use MQTT. This package works well with HomeAssistant and can be easily [installed as an addon](docs/HA_Addon_Instructions.md) using the HomeAssistant Supervisor. -Version: 0.9.1 ([History](CHANGELOG.md)) +Version: 0.9.2 ([History](CHANGELOG.md)) ### Recent Breaking Changes diff --git a/build-docker.sh b/build-docker.sh index 5f88f2cf..d0480b0c 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -2,6 +2,6 @@ docker run --rm --privileged \ -v ~/.docker:/root/.docker \ - homeassistant/amd64-builder --all \ - -r https://github.com/TD22057/insteon-mqtt \ - -b master + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + homeassistant/amd64-builder \ + --all -r https://github.com/TD22057/insteon-mqtt -b master diff --git a/config.json b/config.json index 9c0ee536..e7232c71 100644 --- a/config.json +++ b/config.json @@ -2,7 +2,7 @@ "name": "Insteon MQTT", "description": "Creates an MQTT interface to the Insteon protocol.", "slug": "insteon-mqtt", - "version": "0.9.1", + "version": "0.9.2", "startup": "services", "arch": ["amd64","armhf","aarch64","i386"], "boot": "auto", diff --git a/insteon_mqtt/config.py b/insteon_mqtt/config.py index 882113de..e246bac2 100644 --- a/insteon_mqtt/config.py +++ b/insteon_mqtt/config.py @@ -347,16 +347,6 @@ def _find_error(self, meta, error_path, iter): class IMValidator(Validator): """ Adds a few check_with functions to validate specific settings """ - def _check_with_valid_ip(self, field, value): - """ Tests whether value is a valid ipv4 or ipv6 address - - Uses the library ipaddress for accuracy - """ - try: - ipaddress.ip_address(value) - except ValueError: - self._error(field, "Invalid IP Address") - def _check_with_valid_insteon_addr(self, field, value): """ Tests whether value is a valid Insteon Address for Insteon MQTT diff --git a/insteon_mqtt/const.py b/insteon_mqtt/const.py index 436dce70..9dd69fb4 100644 --- a/insteon_mqtt/const.py +++ b/insteon_mqtt/const.py @@ -11,6 +11,6 @@ variable throughout the code without causing a cyclic import """ -__version__ = "0.9.1" +__version__ = "0.9.2" #=========================================================================== diff --git a/insteon_mqtt/schemas/config-schema.yaml b/insteon_mqtt/schemas/config-schema.yaml index 8cb3d6f6..9139ec1c 100644 --- a/insteon_mqtt/schemas/config-schema.yaml +++ b/insteon_mqtt/schemas/config-schema.yaml @@ -58,7 +58,6 @@ insteon: two following definitions must be satisfied. hub_ip: type: string - check_with: valid_ip hub_port: type: integer min: 0 @@ -140,8 +139,6 @@ insteon: mqtt: type: dict - meta: - schema_error: unknown field allow_unknown: ## The only unknown keys are user defined discovery_class settings type: dict @@ -164,7 +161,6 @@ mqtt: schema: broker: type: string - check_with: valid_ip required: True port: type: integer diff --git a/setup.py b/setup.py index b85779b5..695cb36b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setuptools.setup( name = 'insteon-mqtt', - version = '0.9.1', + version = '0.9.2', description = "Insteon <-> MQTT bridge server", long_description = readme, author = "Ted Drain", diff --git a/tests/test_config.py b/tests/test_config.py index e940ceef..c7bb1558 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -93,6 +93,13 @@ def test_good_hub(self): val = IM.config.validate(file) assert val == "" + #----------------------------------------------------------------------- + def test_dns(self): + file = os.path.join(os.path.dirname(os.path.realpath(__file__)), + 'configs', 'use_dns.yaml') + val = IM.config.validate(file) + assert val == "" + #----------------------------------------------------------------------- def test_validate_addr(self): validator = IM.config.IMValidator()