Skip to content

Commit

Permalink
Merge branch 'jabesq:development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
wuede authored Jul 24, 2023
2 parents 1a5319c + 75c1ef7 commit 74f7c46
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 1,430 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: 3.8
- name: Install dependencies
Expand All @@ -30,6 +30,6 @@ jobs:
# password: ${{ secrets.PYPI_TEST_TOKEN }}
# repository_url: https://test.pypi.org/legacy/
- name: Publish 📦 to PyPI
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.pypi_prod_token }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
ref: development
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: 3.8
- name: Install dependencies
Expand All @@ -28,7 +28,7 @@ jobs:
run: >-
python -m build .
- name: Publish 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.PYPI_TEST_TOKEN }}
repository_url: https://test.pypi.org/legacy/
6 changes: 3 additions & 3 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@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: ${{ matrix.python-version }}
- name: Run tests with tox
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ target/
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
Pipfile.lock

# celery beat schedule file
celerybeat-schedule
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,38 +7,38 @@ ci:

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

- repo: https://github.com/asottile/add-trailing-comma
rev: v2.4.0
rev: v3.0.0
hooks:
- id: add-trailing-comma
args: [--py36-plus]
exclude: "external_src/int-tools"

- repo: https://github.com/asottile/yesqa
rev: v1.4.0
rev: v1.5.0
hooks:
- id: yesqa

- repo: https://github.com/psf/black
rev: 22.12.0
rev: 23.3.0
hooks:
- id: black
language_version: python3

- repo: https://github.com/pycqa/isort
rev: 5.11.4
rev: 5.12.0
hooks:
- id: isort
name: isort (python)

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.991
rev: v1.4.1
hooks:
- id: mypy
name: mypy
Expand Down Expand Up @@ -70,7 +70,7 @@ repos:
additional_dependencies: [flake8-typing-imports==1.14.0]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.2.0
rev: v2.4.0
hooks:
- id: setup-cfg-fmt
args: [--include-version-classifiers]
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ verify_ssl = true

[dev-packages]
black = "*"
bleach = "~=5.0"
bleach = "~=6.0"
docutils = "*"
flake8 = "*"
time-machine = "*"
Expand Down
1,411 changes: 0 additions & 1,411 deletions Pipfile.lock

This file was deleted.

1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ url = https://github.com/jabesq/pyatmo
author = Hugo Dupras
author_email = [email protected]
license = MIT
license_file = LICENSE.txt
license_files = LICENSE.txt
classifiers =
License :: OSI Approved :: MIT License
Expand Down
1 change: 0 additions & 1 deletion src/pyatmo/weather_station.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ def get_last_data(self, station_id: str, exclude: int = 0) -> dict:
last_data[station[key]]["reachable"] = station.get("reachable")

for module in station["modules"]:

if "dashboard_data" not in module or key not in module:
continue

Expand Down
1 change: 0 additions & 1 deletion tests/test_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ async def test_async_public_data_error(async_auth):
"pyatmo.auth.AbstractAsyncAuth.async_post_api_request",
AsyncMock(return_value=mock_resp),
):

public_data = pyatmo.AsyncPublicData(async_auth, LAT_NE, LON_NE, LAT_SW, LON_SW)

with pytest.raises(pyatmo.NoDevice):
Expand Down

0 comments on commit 74f7c46

Please sign in to comment.