Merge bf436eb into 63d2630

XKNX · Mar 28, 2021 · 2c4e708 · 2c4e708
2 parents 63d2630 + bf436eb
commit 2c4e708
Show file tree

Hide file tree

Showing 92 changed files with 13 additions and 3,234 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -7,6 +7,9 @@ has_children: true
 
 # Configuration
 
+NOTE: Using `xknx.yaml` is no longer supported and the functionality will be removed in a future version. Instead, please
+use standard python code or (if you are using Home Assistant) simply use the Home Assistant configuration to configure your KNX devices.
+
 ## Overview
 
 XKNX is controlled via a configuration file. Per default the configuration file is named `xknx.yaml`.

diff --git a/setup.cfg b/setup.cfg
@@ -37,8 +37,4 @@ python_version = 3.8
 strict = true
 warn_unreachable = true
 implicit_reexport = true
-ignore_missing_imports = true
-
-# untyped modules
-[mypy-xknx.config.config_validation,xknx.config.objects,xknx.config.yaml_loader]
-ignore_errors = true
+ignore_missing_imports = true
diff --git a/test/config_tests/config_v1_test.py b/test/config_tests/config_v1_test.py
@@ -122,15 +122,6 @@ def test_config_connection(self):
             ConfigV1(TestConfig.xknx).parse_connection(config)
             self.assertEqual(TestConfig.xknx.connection_config, expected_conn)
 
-    def test_version_2(self):
-        """Test connection section from config file."""
-        # Replaces setting from xknx.yaml
-        test_config = """
-        version: 2
-        """
-        config = yaml.safe_load(test_config)
-        self.assertRaises(NotImplementedError, Config(TestConfig.xknx).parse, config)
-
     def test_config_invalid_connection(self):
         """Test invalid connection section from config file."""
 

diff --git a/test/config_tests/resources/binary_sensor/invalid_1.yaml b/test/config_tests/resources/binary_sensor/invalid_1.yaml
diff --git a/test/config_tests/resources/binary_sensor/invalid_2.yaml b/test/config_tests/resources/binary_sensor/invalid_2.yaml
diff --git a/test/config_tests/resources/binary_sensor/invalid_3.yaml b/test/config_tests/resources/binary_sensor/invalid_3.yaml
diff --git a/test/config_tests/resources/binary_sensor/invalid_4.yaml b/test/config_tests/resources/binary_sensor/invalid_4.yaml
diff --git a/test/config_tests/resources/binary_sensor/invalid_5.yaml b/test/config_tests/resources/binary_sensor/invalid_5.yaml
diff --git a/test/config_tests/resources/binary_sensor/valid_1.yaml b/test/config_tests/resources/binary_sensor/valid_1.yaml
diff --git a/test/config_tests/resources/binary_sensor/valid_2.yaml b/test/config_tests/resources/binary_sensor/valid_2.yaml
diff --git a/test/config_tests/resources/binary_sensor/valid_3.yaml b/test/config_tests/resources/binary_sensor/valid_3.yaml
diff --git a/test/config_tests/resources/binary_sensor/valid_4.yaml b/test/config_tests/resources/binary_sensor/valid_4.yaml
diff --git a/test/config_tests/resources/climate/invalid_1.yaml b/test/config_tests/resources/climate/invalid_1.yaml
diff --git a/test/config_tests/resources/climate/invalid_2.yaml b/test/config_tests/resources/climate/invalid_2.yaml
diff --git a/test/config_tests/resources/climate/invalid_3.yaml b/test/config_tests/resources/climate/invalid_3.yaml
diff --git a/test/config_tests/resources/climate/valid_1.yaml b/test/config_tests/resources/climate/valid_1.yaml
diff --git a/test/config_tests/resources/climate/valid_2.yaml b/test/config_tests/resources/climate/valid_2.yaml
diff --git a/test/config_tests/resources/connection/invalid_1.yaml b/test/config_tests/resources/connection/invalid_1.yaml
diff --git a/test/config_tests/resources/connection/invalid_2.yaml b/test/config_tests/resources/connection/invalid_2.yaml
diff --git a/test/config_tests/resources/connection/invalid_3.yaml b/test/config_tests/resources/connection/invalid_3.yaml
diff --git a/test/config_tests/resources/connection/valid_1.yaml b/test/config_tests/resources/connection/valid_1.yaml
diff --git a/test/config_tests/resources/connection/valid_2.yaml b/test/config_tests/resources/connection/valid_2.yaml
diff --git a/test/config_tests/resources/connection/valid_3.yaml b/test/config_tests/resources/connection/valid_3.yaml
diff --git a/test/config_tests/resources/cover/invalid_1.yaml b/test/config_tests/resources/cover/invalid_1.yaml
diff --git a/test/config_tests/resources/cover/invalid_2.yaml b/test/config_tests/resources/cover/invalid_2.yaml
diff --git a/test/config_tests/resources/cover/valid_1.yaml b/test/config_tests/resources/cover/valid_1.yaml