From e42ffa125392cea5a7f756e7d70fdc614895c46c Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 19 Jul 2023 11:36:33 +0300 Subject: [PATCH 1/2] Clean up vestigial bits from setup.cfg --- setup.cfg | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/setup.cfg b/setup.cfg index 037abb2..2c1a928 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,40 +19,3 @@ install_requires = packages = upcloud_api upcloud_api.cloud_manager - -[bdist_wheel] -universal = 1 - -[flake8] -max-line-length = 99 -extend-ignore = - # ignore line length problems; those are fixed by black - E501 - # via black - E203 - W503 - # docstring format leniency - D100 - D104 - D105 - D200 - D202 - D205 - D400 - D401 - D403 - # things from `hacking` we don't care about - H101 - H301 - H306 - H404 - H405 -per-file-ignores = - test/*: D101,D102,D103,F841,S101,S106,B011 - # ignore "imported but not used" in any __init__.pys - */__init__.py: F401 -exclude = - .git - ENV - __pycache__ - build From 21187c2990e4131a97466d120eb67b085d019b97 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 19 Jul 2023 11:37:13 +0300 Subject: [PATCH 2/2] Target Python 3.7+, enable Ruff upgrades --- .github/workflows/main.yml | 1 - README.md | 1 - pyproject.toml | 4 +++- setup.cfg | 2 +- tox.ini | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03f6363..d33a86b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,6 @@ jobs: strategy: matrix: tox_env: - - py36 - py37 - py38 - py39 diff --git a/README.md b/README.md index f17ef4a..d43f787 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ python setup.py install ### Supported Python versions in API v2.0.1 -- Python 3.6 - Python 3.7 - Python 3.8 - Python 3.9 diff --git a/pyproject.toml b/pyproject.toml index f2084f8..6fb2a87 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,10 @@ [tool.black] line-length = 99 -target-version = ['py36'] +target-version = ['py37'] skip-string-normalization = true [tool.ruff] +target-version = "py37" exclude = [ ".git", "ENV", @@ -34,6 +35,7 @@ select = [ "F", "I", "S", + "UP", "W", ] diff --git a/setup.cfg b/setup.cfg index 2c1a928..2c4d217 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,7 @@ packages=['upcloud_api', 'upcloud_api.cloud_manager'] license = MIT [options] -python_requires = >=3.6, <4 +python_requires = >=3.7, <4 setup_requires = setuptools install_requires = diff --git a/tox.ini b/tox.ini index bcec688..2f685e5 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py36, py37, py38, py39, pypy3 +envlist = py37, py38, py39, pypy3 skip_missing_interpreters = True [testenv]