From 09b62ccf579d358dfb38ff83db25d10938ae9d08 Mon Sep 17 00:00:00 2001 From: Sylvain Hellegouarch Date: Sun, 2 Apr 2023 21:45:04 +0200 Subject: [PATCH] Packaging updates to support newer versions Fixes #12 Signed-off-by: Sylvain Hellegouarch --- .flake8 | 4 ---- .ruff.toml | 2 ++ CHANGELOG.md | 7 +++++++ Makefile | 3 ++- requirements-dev.txt | 4 ++-- requirements.txt | 2 +- setup.py | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 .flake8 create mode 100644 .ruff.toml diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 52e9a22..0000000 --- a/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -max-line-length = 200 -ignore = E203, W503 -exclude = .git,__pycache__,build,dist,.venv,.coverage \ No newline at end of file diff --git a/.ruff.toml b/.ruff.toml new file mode 100644 index 0000000..1f1a445 --- /dev/null +++ b/.ruff.toml @@ -0,0 +1,2 @@ +extend-exclude = [".venv"] +ignore = ["E501"] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f59678..5bb335c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## [Unreleased] +### Changed + +- Swaped flake8 for ruff to remove an issue with flake8 being stuck with an + old dependency on Python 3.7. Bonus point, ruff is much faster. #12 +- Updated Python version pattern matching in `setup.py` to work with most recent + changes in the Python packaging world + ## [0.1.8][] - 2023-03-07 [0.1.8]: https://github.com/awslabs/aws-az-failure-chaostoolkit/tree/v0.1.8 diff --git a/Makefile b/Makefile index 50f2af4..8cf9e5a 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,11 @@ install-dev: install fmt: isort . black . + ruff --fix azchaosaws/ tests/ .PHONY: lint lint: - flake8 azchaosaws/ tests/ --count --statistics + ruff azchaosaws/ tests/ .PHONY: test test: diff --git a/requirements-dev.txt b/requirements-dev.txt index f18f01e..6be565e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,6 @@ coverage pytest>=2.8 pytest-cov black -flake8 wheel -isort \ No newline at end of file +isort +ruff \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index d664e5e..7da24b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -chaostoolkit-lib>=1.1.2,<1.31.1 +chaostoolkit-lib>=1.1.2 logzero>=1.7.0,<2.0.0 boto3>=1.18.32,<2.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 26d399b..f67ed14 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ install_requires=install_require, tests_require=test_require, setup_requires=pytest_runner, - python_requires=">=3.7.*", + python_requires=">=3.7", )