Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into dependabot/pip/requests-2.32.2
Browse files Browse the repository at this point in the history
  • Loading branch information
villevsv-upcloud committed May 30, 2024
2 parents a5580f4 + 4f0871b commit 19cd89d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 16 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,30 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.11
- uses: pre-commit/action@v3.0.0
python-version: 3.12
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
build:
runs-on: ubuntu-latest
strategy:
matrix:
tox_env:
- py37
- py38
- py39
- py310
- py311
- py312
- pypy3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Fedora Tox with ${{ matrix.tox_env }}
uses: fedora-python/tox-github-action@v37.0
uses: fedora-python/tox-github-action@6f0add50b32e4bedfd98976984ffa499af4c218b # v39.0
with:
tox_env: ${{ matrix.tox_env }}
- uses: actions/setup-python@v4
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
cache: pip
cache-dependency-path: |
Expand All @@ -40,9 +41,9 @@ jobs:
name: Build deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: casperdcl/deploy-pypi@v2.3.2
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
- uses: casperdcl/deploy-pypi@10cf4cd83fc885003a8d4f37f93a5a0f0fc2d2f4 # v2.4.1
with:
password: ${{ secrets.PYPI_TOKEN }}
build: true
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Added `encrypted` boolean flag to Storage for encryption at rest support

### Changed

- Python versions supported: 3.8, 3.9, 3.10, 3.11, 3.12, PyPy3. Dropped support for 3.7.

## [2.5.1] - 2023-09-19

### Added
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ python setup.py install

### Supported Python versions in API v2.5.1

- Python 3.7
- Python 3.8
- Python 3.9
- Python 3.10
- Python 3.11
- Python 3.12
- PyPy3

**Python 2 has been deprecated**
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[tool.black]
line-length = 99
target-version = ['py37']
target-version = ['py38']
skip-string-normalization = true

[tool.ruff]
target-version = "py37"
target-version = "py38"
exclude = [
".git",
"ENV",
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages=['upcloud_api', 'upcloud_api.cloud_manager']
license = MIT

[options]
python_requires = >=3.7, <4
python_requires = >=3.8, <4
setup_requires =
setuptools
install_requires =
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py37, py38, py39, py310, pypy3
envlist = py38, py39, py310, py311, py312, pypy3
skip_missing_interpreters = True

[testenv]
Expand Down

0 comments on commit 19cd89d

Please sign in to comment.