Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*
Copy this file to .devcontainer.json
if using PODMAN, instead of DOCKER, uncomment the runArgs section

NOTE: 3.12 may not work with debugging yet.
*/
{
"name": "sHedC/python-masterthermconnect",
"image": "mcr.microsoft.com/devcontainers/python:0-3.11-bullseye",
"postCreateCommand": "pip3 install --user -r requirements.txt && python3 -m pip install -e .",
"image": "mcr.microsoft.com/devcontainers/python:1-3.12",
"postCreateCommand": "pip install --upgrade pip && pip install --user -r requirements.txt && python3 -m pip install -e .",
"customizations": {
"vscode": {
"settings": {
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ name: "Lint"

on:
push:
branches:
- "main"
branches: [ main, nextrelease ]
pull_request:
branches:
- "main"
branches: [ main ]

jobs:
ruff:
Expand All @@ -19,7 +17,7 @@ jobs:
- name: "Set up Python"
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
cache: "pip"

- name: "Install requirements"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Fix Python 3.13 to alpha 3 as aiohttp will break on later.
os: [macos-latest, windows-latest, ubuntu-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13.0-alpha.3"]

steps:
- uses: actions/checkout@v4
Expand All @@ -39,7 +40,7 @@ jobs:
tox -e py-coverage

- name: Upload coverage to Codecov
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' }}
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12' }}
uses: codecov/codecov-action@v4
with:
files: ./coverage.xml
2 changes: 1 addition & 1 deletion .github/workflows/push-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion masterthermconnect/__version__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Python API wrapper for Mastertherm Connect."""

__version__ = "2.2.11"
__version__ = "2.3.0a0"
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "masterthermconnect"
version = "2.2.11"
version = "2.3.0a0"
description = "Python 3 API wrapper for Mastertherm API"
readme = "README.md"
authors = [{ name = "Richard Holmes", email = "richard@shedc.uk" }]
Expand All @@ -19,7 +19,7 @@ dependencies = [
"aiohttp>=3.9.1",
"natsort>=8.3.1"
]
requires-python = ">=3.9,<3.13"
requires-python = ">=3.9,<3.14"

[project.optional-dependencies]
dev = ["black", "bumpver", "isort", "pip-tools", "pytest"]
Expand All @@ -31,7 +31,7 @@ Homepage = "https://github.com/sHedC/python-masterthermconnect"
masterthermconnect = "masterthermconnect.__main__:main"

[tool.bumpver]
current_version = "2.2.11"
current_version = "2.3.0-a0"
version_pattern = "MAJOR.MINOR.PATCH[-PYTAGNUM]"
commit_message = "bump version {old_version} -> {new_version}"
commit = true
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ forced_separate = tests
combine_as_imports = true

[mypy]
python_version = 3.11
python_version = 3.12
ignore_errors = true
follow_imports = silent
ignore_missing_imports = true
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
minversion = 4.0.16
isolated_build = true
env_list = py{39,311}
env_list = py{311,312,3130a3}

[testenv]
description = run the tests with pytest
Expand Down