Skip to content

Commit

Permalink
Merge branch 'jabesq-org:development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
tmenguy authored Sep 26, 2024
2 parents dbb3e4b + 6cbe62f commit b89b07b
Show file tree
Hide file tree
Showing 38 changed files with 1,816 additions and 527 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,17 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python 3.10
uses: actions/setup-python@v5.1.1
- name: Set up Python 3.11
uses: actions/setup-python@v5.2.0
with:
python-version: 3.10.8
python-version: 3.11.4
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel build
- name: Build a binary wheel and a source tarball
run: >-
python -m build .
# - name: Publish 📦 to Test PyPI
# uses: pypa/gh-action-pypi-publish@master
# with:
# password: ${{ secrets.PYPI_TEST_TOKEN }}
# repository-url: https://test.pypi.org/legacy/
- name: Publish 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
with:
ref: development
fetch-depth: 0
- name: Set up Python 3.10
uses: actions/setup-python@v5.1.1
- name: Set up Python 3.11
uses: actions/setup-python@v5.2.0
with:
python-version: 3.10.8
python-version: 3.11.4
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
29 changes: 25 additions & 4 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -55,17 +55,38 @@ jobs:
run: |
ruff check src/pyatmo
typechecker:
runs-on: ubuntu-latest
strategy:
max-parallel: 1
matrix:
python-version: [3.11.4]

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/[email protected]
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install mypy types-requests
- name: Typecheck with mypy
run: |
mypy src/pyatmo
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.10.8, 3.11.4]
python-version: [3.11.4, 3.12.5]

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Run tests with tox
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: ^(fixtures/)

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.1
rev: v0.6.5
hooks:
- id: ruff
args:
Expand All @@ -18,7 +18,7 @@ repos:
language_version: python3

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.11.1
rev: v1.11.2
hooks:
- id: mypy
name: mypy
Expand Down
20 changes: 5 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Added

-
## [9.0.0]

### Changed

-

### Deprecated

-
- Replaced pipenv with uv and updated readme

### Removed

-
- Python 3.10 support

### Fixed

-

### Security

- Propper handling of climate schedules in heating or cooling
- Fix HVAC related setpoint evaluation

## [8.1.0]

Expand Down
26 changes: 0 additions & 26 deletions Pipfile

This file was deleted.

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ Be aware that the module may stop working if Netatmo decides to change their API

## Development

Clone the repo and install dependencies:
Prerequisits:

git clone
cd pyatmo
pipenv install --dev
uv
python >=3.11

To add the pre-commit hook to your environment run:
Clone the repo, install dependencies and install pre-commit hooks:

pip install pre-commit
git clone
cd pyatmo
uv sync
pre-commit install

## Testing
Expand Down
2 changes: 1 addition & 1 deletion fixtures/homesdata.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
"name": "Default",
"selected": true,
"id": "591b54a2764ff4d50d8b5795",
"type": "therm"
"type": "cooling"
},
{
"zones": [
Expand Down
Loading

0 comments on commit b89b07b

Please sign in to comment.