From 76b927d51e5d69acfcae7d0cb4e22ddc3e287aee Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Thu, 28 Nov 2024 20:43:11 +0100 Subject: [PATCH 1/5] Bump python to 3.123 following core 2024.12 --- .github/workflows/merge.yml | 2 +- .github/workflows/verify.yml | 6 +++--- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 4 ++++ pyproject.toml | 11 ++++++----- scripts/python-venv.sh | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f831c7642..e4142a204 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -5,7 +5,7 @@ name: Latest release env: CACHE_VERSION: 10 - DEFAULT_PYTHON: "3.12" + DEFAULT_PYTHON: "3.13" # Only run on merges on: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 279cbfd53..55ad879c4 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -5,7 +5,7 @@ name: Latest commit env: CACHE_VERSION: 11 - DEFAULT_PYTHON: "3.12" + DEFAULT_PYTHON: "3.13" PRE_COMMIT_HOME: ~/.cache/pre-commit on: @@ -173,7 +173,7 @@ jobs: needs: commitcheck strategy: matrix: - python-version: ["3.12"] + python-version: ["3.13"] steps: - name: Check out committed code uses: actions/checkout@v4 @@ -213,7 +213,7 @@ jobs: needs: prepare-test-cache strategy: matrix: - python-version: ["3.12"] + python-version: ["3.13"] steps: - name: Check out committed code diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7225c16f2..6de7d59f9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ ci: default_language_version: # force all unspecified python hooks to run python3 - python: python3.12 + python: python3.13 repos: # Run manually in CI skipping the branch checks diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b9c73f3..666501d16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v1.6.1 + +- Support python 3.13 + ## v1.6.0 - New Feature: implement collection of location/zone data: Plugwise Adam thermostat representations are zone-based instead of device-based. diff --git a/pyproject.toml b/pyproject.toml index 67d8fb350..6121689c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "1.6.0" +version = "1.6.1" license = {file = "LICENSE"} description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md" @@ -15,6 +15,7 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Home Automation", ] authors = [ @@ -24,7 +25,7 @@ maintainers = [ { name = "bouwew"}, { name = "CoMPaTech" } ] -requires-python = ">=3.11.0" +requires-python = ">=3.12.0" dependencies = [ "aiohttp", "defusedxml", @@ -47,7 +48,7 @@ include-package-data = true include = ["plugwise*"] [tool.black] -target-version = ["py312"] +target-version = ["py313"] exclude = 'generated' [tool.isort] @@ -185,7 +186,7 @@ norecursedirs = [ ] [tool.mypy] -python_version = "3.12" +python_version = "3.13" show_error_codes = true follow_imports = "silent" ignore_missing_imports = true @@ -215,7 +216,7 @@ omit= [ ] [tool.ruff] -target-version = "py312" +target-version = "py313" lint.select = [ "B002", # Python does not support the unary prefix increment diff --git a/scripts/python-venv.sh b/scripts/python-venv.sh index 3cf811bba..bef499779 100755 --- a/scripts/python-venv.sh +++ b/scripts/python-venv.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eu -pyversions=(3.12) +pyversions=(3.13 3.12) my_path=$(git rev-parse --show-toplevel) my_venv=${my_path}/venv From 13d337217ff34f41c076a015246e2663f0c1a99b Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Thu, 28 Nov 2024 20:52:42 +0100 Subject: [PATCH 2/5] CodeRabbit correctly identifies core as not current on 313 --- .github/workflows/verify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 55ad879c4..fb31cc688 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -5,7 +5,7 @@ name: Latest commit env: CACHE_VERSION: 11 - DEFAULT_PYTHON: "3.13" + DEFAULT_PYTHON: "3.13 3.12" PRE_COMMIT_HOME: ~/.cache/pre-commit on: @@ -173,7 +173,7 @@ jobs: needs: commitcheck strategy: matrix: - python-version: ["3.13"] + python-version: ["3.13 3.12"] steps: - name: Check out committed code uses: actions/checkout@v4 @@ -213,7 +213,7 @@ jobs: needs: prepare-test-cache strategy: matrix: - python-version: ["3.13"] + python-version: ["3.13 3.12"] steps: - name: Check out committed code From 6668889af4c5177f9ac5d17c8053ca5902fdcc52 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Thu, 28 Nov 2024 20:54:55 +0100 Subject: [PATCH 3/5] Workflows to 3.13 --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index fb31cc688..8a0ebf7e0 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -5,7 +5,7 @@ name: Latest commit env: CACHE_VERSION: 11 - DEFAULT_PYTHON: "3.13 3.12" + DEFAULT_PYTHON: "3.13" PRE_COMMIT_HOME: ~/.cache/pre-commit on: From 8bf474a0902a900a21bda0e0046549fa4e63d82d Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Thu, 28 Nov 2024 20:59:07 +0100 Subject: [PATCH 4/5] Fix correct list --- .github/workflows/verify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8a0ebf7e0..a91d7bec4 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -173,7 +173,7 @@ jobs: needs: commitcheck strategy: matrix: - python-version: ["3.13 3.12"] + python-version: ["3.13" "3.12"] steps: - name: Check out committed code uses: actions/checkout@v4 @@ -213,7 +213,7 @@ jobs: needs: prepare-test-cache strategy: matrix: - python-version: ["3.13 3.12"] + python-version: ["3.13" "3.12"] steps: - name: Check out committed code From 47479014d36f83e0f052d31e32ea9b14ffd6b08c Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Thu, 28 Nov 2024 21:05:24 +0100 Subject: [PATCH 5/5] Fix correct list --- .github/workflows/verify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index a91d7bec4..2923fa67a 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -173,7 +173,7 @@ jobs: needs: commitcheck strategy: matrix: - python-version: ["3.13" "3.12"] + python-version: ["3.13", "3.12"] steps: - name: Check out committed code uses: actions/checkout@v4 @@ -213,7 +213,7 @@ jobs: needs: prepare-test-cache strategy: matrix: - python-version: ["3.13" "3.12"] + python-version: ["3.13", "3.12"] steps: - name: Check out committed code