Merge pull request #18 from elahd/fix-aiohttp-conflict

Fix aiohttp version conflict with Home Assistant + housekeeping.

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "ghcr.io/ludeeus/devcontainer/integration:latest",
+  "image": "ghcr.io/ludeeus/devcontainer/integration:stable",
   "name": "ha-nyc311",
   "features": {
     "github-cli": "latest"
@@ -8,7 +8,7 @@
     "WORKSPACE_DIRECTORY": "/workspaces/ha-nyc311",
     "POST_SET_VERSION_HOOK": "/workspaces/ha-nyc311/.devcontainer/post-set-version-hook.sh"
   },
-  "postCreateCommand": "container install && pip install --upgrade pip && pip install -r requirements-dev.txt && pre-commit install && pre-commit install-hooks && pip install --editable /workspaces/nyc311calendar && chmod +x /workspaces/ha-nyc311/.devcontainer/post-set-version-hook.sh",
+  "postCreateCommand": "chmod +x /workspaces/ha-nyc311/.devcontainer/post-create-script.sh && sh /workspaces/ha-nyc311/.devcontainer/post-create-script.sh",
   "appPort": ["8123:8123"],
   "extensions": [
     "ms-python.vscode-pylance",
@@ -40,7 +40,7 @@
     "editor.formatOnPaste": false,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
-    "files.trimTrailingWhitespace": true,
+    "files.trimTrailingWhitespace": false,
     "python.linting.mypyEnabled": true,
     "python.defaultInterpreterPath": "/usr/local/python/bin/python",
     "python.formatting.blackPath": "/usr/local/python/bin/black",
@@ -49,7 +49,8 @@
     "python.linting.mypyPath": "/usr/local/python/bin/mypy",
     "python.linting.pycodestylePath": "/usr/local/python/bin/pycodestyle",
     "python.linting.pylintPath": "/usr/local/python/bin/pylint",
-    "python.sortImports.path": "/usr/local/python/bin/isort",
+    "isort.path": ["/usr/local/python/bin/isort"],
+    "python.pythonPath": "/usr/local/python/bin/python",
     "typescript.tsc.autoDetect": "off",
     "grunt.autoDetect": "off",
     "jake.autoDetect": "off",

.devcontainer/post-create-script.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+container install
+pip install --upgrade pip
+pip install -r requirements-dev.txt
+pre-commit install
+pre-commit install-hooks
+chmod +x /workspaces/ha-nyc311/.devcontainer/post-set-version-hook.sh
+
+lib_dir="/workspaces/nyc311calendar"
+repo_url="https://github.com/elahd/nyc311calendar.git"
+
+if [ ! -d $lib_dir ]; then
+    echo "Cloning nyc311calendar repository..."
+    git clone "$repo_url" "$lib_dir"
+else
+    echo "nyc311calendar repository directory already exists."
+fi
+
+python /workspaces/nyc311calendar/setup.py develop

.pre-commit-config.yaml

@@ -87,3 +87,4 @@ repos:
         args:
           - --output-format=colorized
           - -d W0511
+          - --fail-on=all

.vscode/settings.json

@@ -18,6 +18,7 @@
   "python.linting.mypyPath": "/usr/local/python/bin/mypy",
   "python.linting.pycodestylePath": "/usr/local/python/bin/pycodestyle",
   "python.linting.pylintPath": "/usr/local/python/bin/pylint",
-  "python.sortImports.path": "/usr/local/python/bin/isort",
-  "npm.autoDetect": "off"
+  "isort.path": ["/usr/local/python/bin/isort"],
+  "npm.autoDetect": "off",
+  "python.analysis.extraPaths": ["/workspaces/nyc311calendar"]
 }

.vscode/tasks.json

@@ -16,7 +16,7 @@
     {
       "label": "Run Home Assistant configuration against /config",
       "type": "shell",
-      "command": "container check",
+      "command": "container check-config",
       "problemMatcher": []
     },
     {

custom_components/nyc311/manifest.json

@@ -4,12 +4,12 @@
   "config_flow": true,
   "documentation": "https://www.github.com/elahd/ha-nyc311",
   "issue_tracker": "https://www.github.com/elahd/ha-nyc311/issues",
-  "requirements": ["nyc311calendar==v0.4"],
+  "requirements": ["nyc311calendar==v0.4.1"],
   "ssdp": [],
   "zeroconf": [],
   "homekit": {},
   "dependencies": [],
   "codeowners": ["@elahd"],
   "iot_class": "cloud_polling",
-  "version": "v0.1.2"
+  "version": "v0.1.3"
 }

pylint/plugins/hass_constructor.py

@@ -1,20 +1,18 @@
 """Plugin for constructor definitions."""
-from astroid import Const
-from astroid import FunctionDef
+from __future__ import annotations
+
+from astroid import nodes
 from pylint.checkers import BaseChecker
-from pylint.interfaces import IAstroidChecker
 from pylint.lint import PyLinter
 
 
 class HassConstructorFormatChecker(BaseChecker):  # type: ignore[misc]
     """Checker for __init__ definitions."""
 
-    __implements__ = IAstroidChecker
-
     name = "hass_constructor"
     priority = -1
     msgs = {
-        "W0006": (
+        "W7411": (
             '__init__ should have explicit return type "None"',
             "hass-constructor-return",
             "Used when __init__ has all arguments typed "
@@ -23,7 +21,7 @@ class HassConstructorFormatChecker(BaseChecker):  # type: ignore[misc]
     }
     options = ()
 
-    def visit_functiondef(self, node: FunctionDef) -> None:
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
         """Called when a FunctionDef node is visited."""
         if not node.is_method() or node.name != "__init__":
             return
@@ -44,7 +42,7 @@ def visit_functiondef(self, node: FunctionDef) -> None:
             return
 
         # Check that return type is specified and it is "None".
-        if not isinstance(node.returns, Const) or node.returns.value is not None:
+        if not isinstance(node.returns, nodes.Const) or node.returns.value is not None:
             self.add_message("hass-constructor-return", node=node)