Merge pull request #253 from plugwise/cleanup

Pyproject.toml PEP-621 including versioning & cleanup of separate config files

Author: bouwew

.coveragerc

@@ -4,8 +4,8 @@
 name: Latest release
 
 env:
-  CACHE_VERSION: 6
-  DEFAULT_PYTHON: 3.9
+  CACHE_VERSION: 7
+  DEFAULT_PYTHON: 3.10
 
 # Only run on merges
 on:

.github/workflows/merge.yml

@@ -4,8 +4,8 @@
 name: Latest commit
 
 env:
-  CACHE_VERSION: 9
-  DEFAULT_PYTHON: "3.9"
+  CACHE_VERSION: 2
+  DEFAULT_PYTHON: "3.10"
   PRE_COMMIT_HOME: ~/.cache/pre-commit
 
 on:

.github/workflows/verify.yml

@@ -9,32 +9,32 @@ default_language_version:
 repos:
   # Run manually in CI skipping the branch checks
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.4
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]
       - id: no-commit-to-branch
         args:
           - --branch=main
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
         args:
           - --safe
           - --quiet
         files: ^((plugwise|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.2
     hooks:
       - id: codespell
         args:
@@ -43,18 +43,19 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
-          - pycodestyle==2.8.0
-          - pyflakes==2.4.0
+          - pycodestyle==2.10.0
+          - pyflakes==3.0.1
           - flake8-docstrings==1.6.0
           - pydocstyle==6.1.1
-          - flake8-comprehensions==3.10.0
-          - flake8-noqa==1.2.8
-          - mccabe==0.6.1
+          - flake8-comprehensions==3.10.1
+          - flake8-noqa==1.3.0
+          - mccabe==0.7.0
         files: ^(plugwise|tests)/.+\.py$
+        args: ["--verbose", "--append-config=setup.cfg"]
   - repo: https://github.com/PyCQA/bandit
     rev: 1.7.4
     hooks:
@@ -69,11 +70,11 @@ repos:
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
   - repo: https://github.com/cdce8p/python-typing-update
-    rev: v0.5.0
+    rev: v0.5.1
     hooks:
       # Run `python-typing-update` hook manually from time to time
       # to update python typing syntax.

.pre-commit-config.yaml

@@ -496,7 +496,7 @@ Changelogs below this line are separated in the former python-plugwise USB-only
 ### 0.2.12 - Fix available schema's
 
 - Thanks to report from @fsaris
-- Adept code to allow for change introducted by firmware 4.x
+- Adept code to allow for change introduced by firmware 4.x
 
 ### 0.2.11 - Add community requested sensors
 

CHANGELOG.md

@@ -1,6 +1,4 @@
 """Plugwise module."""
 
-__version__ = "0.27.0"
-
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/__init__.py

@@ -1,3 +1,54 @@
+[build-system]
+requires = ["setuptools~=62.3", "wheel~=0.37.1"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name            = "plugwise"
+version         = "0.27.0"
+license         = {file = "LICENSE"}
+description     = "Plugwise Smile (Adam/Anna/P1), Stretch and USB (Stick) module for Python 3."
+readme          = "README.md"
+keywords        = ["home", "automation", "plugwise", "module"]
+classifiers     = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Topic :: Home Automation",
+]
+authors = [
+        { name = "Plugwise device owners"}
+]
+maintainers = [
+        { name = "bouwew"},
+        { name = "brefra"},
+        { name = "CoMPaTech" }
+]
+requires-python = ">=3.9.0"
+dependencies    = [
+        "aiohttp",
+        "async_timeout",
+        "crcmod",
+        "defusedxml",
+        "munch",
+        "pyserial",
+        "python-dateutil",
+        "semver",
+]
+
+[project.urls]
+"Source Code" = "https://github.com/plugwise/python-plugwise"
+"Bug Reports" = "https://github.com/plugwise/python-plugwise/issues"
+
+[tool.setuptools]
+platforms = ["any"]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["plugwise*"]
+
 [tool.black]
 target-version = ["py39", "py310"]
 exclude = 'generated'
@@ -121,6 +172,12 @@ overgeneral-exceptions = [
 ]
 
 [tool.pytest.ini_options]
+asyncio_mode = "strict"
+markers = [
+    # mark a test as a asynchronous io test.
+    "asyncio",
+]
+
 testpaths = [
     "tests",
 ]
@@ -130,7 +187,7 @@ norecursedirs = [
 ]
 
 [tool.mypy]
-python_version = 3.9
+python_version = 3.10
 show_error_codes = true
 follow_imports = "silent"
 ignore_missing_imports = true
@@ -157,3 +214,17 @@ exclude = [
     "messages",
     "connections",
 ]
+
+[tool.coverage.run]
+source = [ "plugwise" ]
+omit= [
+    "*/venv/*",
+    "setup.py",
+    "plugwise/connections/*",
+    "plugwise/controller.py",
+    "plugwise/messages/*",
+    "plugwise/nodes/*",
+    "plugwise/parser.py",
+    "plugwise/stick.py",
+    "plugwise/util.py",
+]

pyproject.toml

@@ -12,7 +12,7 @@ if [ -f "${my_venv}/bin/activate" ]; then
     . "${my_venv}/bin/activate"
     # Install commit requirements
     pip install wheel
-    pip install --upgrade -r requirements_commit.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
+    pip install --upgrade -e . -r requirements_commit.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
     # Install pre-commit hook
     "${my_venv}/bin/pre-commit" install
 else

pytest.ini

@@ -11,7 +11,7 @@ if [ -f "${my_venv}/bin/activate" ]; then
     # shellcheck disable=SC1091
     . "${my_venv}/bin/activate"
     # Install test requirements
-    pip install --upgrade -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
+    pip install --upgrade -e . -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
     # Install pre-commit hook
     "${my_venv}/bin/pre-commit" install
 else