Skip to content

Commit

Permalink
Merge branch 'release/v7.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jabesq committed Jun 4, 2022
2 parents b5bff23 + a5ac051 commit 1d383ba
Show file tree
Hide file tree
Showing 66 changed files with 8,186 additions and 1,583 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ COPY --from=builder /tmp/requirements_dev.txt /tmp/

# Install Python dependencies from requirements
RUN pip3 install -r /tmp/requirements.txt \
&& pip3 install pdbpp \
&& pip3 install -r /tmp/requirements_dev.txt \
&& rm -rf /tmp/requirements.txt /tmp/requirements_dev.txt pyatmo/

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -51,7 +51,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -65,4 +65,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
8 changes: 4 additions & 4 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:
name: Build and publish 📦 to PyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v2.3.1
uses: actions/setup-python@v3
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
pip install setuptools wheel build
- name: Build a binary wheel and a source tarball
run: >-
python setup.py sdist bdist_wheel
python -m build .
# - name: Publish 📦 to Test PyPI
# uses: pypa/gh-action-pypi-publish@master
# with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ jobs:
name: Build and publish 📦 to TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
ref: development
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v2.3.1
uses: actions/setup-python@v3
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
pip install setuptools wheel build
- name: Build a binary wheel and a source tarball
run: >-
python setup.py sdist bdist_wheel
python -m build .
- name: Publish 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@master
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
python-version: [3.10.0]

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.3.1
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -32,7 +32,7 @@ jobs:
pip install black
- name: Check with black
run: |
black --check --diff src/pyatmo/ tests/ setup.py
black --check --diff src/pyatmo/ tests/
linter:
runs-on: ubuntu-latest
Expand All @@ -42,9 +42,9 @@ jobs:
python-version: [3.10.0]

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.3.1
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -66,9 +66,9 @@ jobs:
python-version: [3.8, 3.9, 3.10.0]

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.3.1
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Run tests with tox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ ci:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.32.1
hooks:
- id: pyupgrade
args: [--py38-plus]
exclude: "external_src/int-tools"

- repo: https://github.com/asottile/add-trailing-comma
rev: v2.2.1
rev: v2.2.3
hooks:
- id: add-trailing-comma
args: [--py36-plus]
Expand All @@ -26,7 +26,7 @@ repos:
- id: yesqa

- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
language_version: python3
Expand All @@ -38,7 +38,7 @@ repos:
name: isort (python)

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
rev: v0.960
hooks:
- id: mypy
name: mypy
Expand All @@ -47,7 +47,7 @@ repos:
- types-requests

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0 # Use the ref you want to point at
rev: v4.2.0 # Use the ref you want to point at
hooks:
- id: check-ast
- id: no-commit-to-branch
Expand All @@ -67,10 +67,10 @@ repos:
hooks:
- id: flake8
exclude: (otp)
additional_dependencies: [flake8-typing-imports==1.10.0]
additional_dependencies: [flake8-typing-imports==1.11.0]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.20.0
rev: v1.20.1
hooks:
- id: setup-cfg-fmt

Expand Down
1 change: 1 addition & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[BASIC]
good-names-rgxs=
NA.*
good-names=on, off

[MESSAGES CONTROL]
# Reasons disabled:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
{
"label": "Build wheel artifacts",
"command": "rm -r dist && python -m build",
"command": "rm -r dist; python -m build",
"type": "shell",
"options": {
"cwd": "${workspaceRoot}/"
Expand Down
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [7.0.0] - 2022-06-05

### Added

- Adds support for Netatmo modulating thermostat
- Adds support for Netatmo doorbell
- Adds support for shutters, lights, energy meters and switches
- Adds support for 3rd party devices from different Legrand brands such as BTicinio, Bubendorff, Smarther, CX3
- Fetch favorite weather sensors
- Add support for third-party Netatmo devices (see `base_url` and `user_prefix` parameters)

### Changed

- Replace freezegun with time-machine

### Deprecated

-

### Removed

-

### Fixed

- Use async fixture decorators

### Security

-

## [6.2.4] - 2022-01-31

### Fixed
Expand Down Expand Up @@ -175,7 +206,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Fix crash when station name is not contained in the backend data

[unreleased]: https://github.com/jabesq/pyatmo/compare/v6.2.4...HEAD
[unreleased]: https://github.com/jabesq/pyatmo/compare/v7.0.0...HEAD
[7.0.0]: https://github.com/jabesq/pyatmo/compare/v6.2.4...v7.0.0
[6.2.4]: https://github.com/jabesq/pyatmo/compare/v6.2.2...v6.2.4
[6.2.2]: https://github.com/jabesq/pyatmo/compare/v6.2.1...v6.2.2
[6.2.1]: https://github.com/jabesq/pyatmo/compare/v6.2.0...v6.2.1
Expand Down
9 changes: 3 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ verify_ssl = true

[dev-packages]
black = "*"
bleach = "~=4.1"
bleach = "~=5.0"
docutils = "*"
flake8 = "*"
freezegun = "*"
time-machine = "*"
isort = "*"
mypy = "*"
pre-commit = "*"
Expand All @@ -19,16 +19,13 @@ pytest-asyncio = "*"
pytest-cov = "*"
pytest-mock = "*"
requests-mock = "*"
tox = "~=3.24"
tox = ">=3.25"
twine = "*"

[packages]
requests = "*"
requests-oauthlib = "*"
aiohttp = ">=3.7.4"

[requires]
python_version = "3.8"

[pipenv]
allow_prereleases = true
Loading

0 comments on commit 1d383ba

Please sign in to comment.