Skip to content

Commit

Permalink
Merge branch 'release/v6.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jabesq committed Nov 19, 2021
2 parents ecd5681 + 19e7a65 commit 58ae867
Show file tree
Hide file tree
Showing 23 changed files with 1,462 additions and 394 deletions.
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
],
"settings": {
"python.pythonPath": "/usr/local/bin/python",
"python.defaultInterpreterPath": "/user/local/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true,
"python.formatting.provider": "black",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Publish 📦 to PyPI

on:
push:
branches:
- master
tags:
- 'v*'

Expand All @@ -12,11 +10,11 @@ jobs:
name: Build and publish 📦 to PyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
with:
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.8
- name: Install dependencies
Expand Down
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 @@ -12,12 +12,12 @@ jobs:
name: Build and publish 📦 to TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
with:
ref: development
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.8
- name: Install dependencies
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
strategy:
max-parallel: 1
matrix:
python-version: [3.8]
python-version: [3.10.0]

steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -39,12 +39,12 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.10.0]

steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -63,18 +63,14 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: [3.8, 3.9, 3.10.0]

steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e .
- name: Run tests with tox
run: |
pip install tox tox-gh-actions
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.3.4
- uses: actions/checkout@v2.4.0
with:
fetch-depth: 0

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

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

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

- repo: https://github.com/asottile/yesqa
rev: v1.2.3
rev: v1.3.0
hooks:
- id: yesqa

- repo: https://github.com/psf/black
rev: 21.9b0
rev: 21.11b1
hooks:
- id: black
language_version: python3

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

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.910
rev: v0.910-1
hooks:
- id: mypy
name: mypy
exclude: tests/
additional_dependencies:
- types-requests

- repo: https://github.com/pycqa/pylint
rev: v2.11.1
hooks:
- id: pylint
name: pylint
additional_dependencies: ["pylint_pytest"]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1 # Use the ref you want to point at
hooks:
Expand All @@ -70,13 +63,22 @@ repos:
- id: check-toml

- repo: https://github.com/PyCQA/flake8
rev: 3.9.2 # pick a git hash / tag to point to
rev: 4.0.1 # pick a git hash / tag to point to
hooks:
- id: flake8
exclude: (otp)
additional_dependencies: [flake8-typing-imports==1.10.0]

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

- repo: local
hooks:
- id: pylint
name: pylint
entry: pylint src tests
language: system
types: [python]
require_serial: true
4 changes: 4 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[BASIC]
good-names-rgxs=
NA.*

[MESSAGES CONTROL]
# Reasons disabled:
# duplicate-code - unavoidable
Expand Down
5 changes: 1 addition & 4 deletions .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 setup.py sdist bdist_wheel && rm -r build",
"command": "rm -r dist && python -m build",
"type": "shell",
"options": {
"cwd": "${workspaceRoot}/"
Expand All @@ -78,9 +78,6 @@
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "never"
},
"problemMatcher": [],
"presentation": {
"reveal": "always",
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [6.2.0]

### Added

- Add support for python3.20
- Introduce climate module #156

### Changed

- Use assignment expressions

## [6.1.0] - 2021-10-03

### Added
Expand Down Expand Up @@ -146,7 +157,9 @@ 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.0.0...HEAD
[unreleased]: https://github.com/jabesq/pyatmo/compare/v6.2.0...HEAD
[6.2.0]: https://github.com/jabesq/pyatmo/compare/v6.1.0...v6.2.0
[6.1.0]: https://github.com/jabesq/pyatmo/compare/v6.0.0...v6.1.0
[6.0.0]: https://github.com/jabesq/pyatmo/compare/v5.2.3...v6.0.0
[5.2.3]: https://github.com/jabesq/pyatmo/compare/v5.2.2...v5.2.3
[5.2.2]: https://github.com/jabesq/pyatmo/compare/v5.2.1...v5.2.2
Expand Down
Loading

0 comments on commit 58ae867

Please sign in to comment.