diff --git a/.github/renovate.json b/.github/renovate.json index 611ac2f0..8d42707b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -21,11 +21,6 @@ "extends": [ "schedule:weekly" ] - }, - { - "matchPackageNames": ["flake8-import-order", "setuptools"], // we're not compatible with 0.19.0 yet due to #226 - "matchManagers": ["poetry"], - "enabled": false } ] } diff --git a/poetry.lock b/poetry.lock index 87281d26..5af44d3e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -185,14 +185,14 @@ pydocstyle = ">=2.1" [[package]] name = "flake8-import-order" -version = "0.18.2" +version = "0.19.2" description = "Flake8 and pylama plugin that checks the ordering of import statements." optional = false python-versions = "*" groups = ["main"] files = [ - {file = "flake8-import-order-0.18.2.tar.gz", hash = "sha256:e23941f892da3e0c09d711babbb0c73bc735242e9b216b726616758a920d900e"}, - {file = "flake8_import_order-0.18.2-py2.py3-none-any.whl", hash = "sha256:82ed59f1083b629b030ee9d3928d9e06b6213eb196fe745b3a7d4af2168130df"}, + {file = "flake8_import_order-0.19.2-py3-none-any.whl", hash = "sha256:2dfe60175e7195cf36d4c573861fd2e3258cd6650cbd7616da3c6b8193b29b7c"}, + {file = "flake8_import_order-0.19.2.tar.gz", hash = "sha256:133b3c55497631e4235074fc98a95078bba817832379f22a31f0ad2455bcb0b2"}, ] [package.dependencies] @@ -706,4 +706,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.9" -content-hash = "7b22b0ed66957b9de172675b36eda4bdce1864dd22917e6d860c1f5c7a2f1bf4" +content-hash = "7d1940a61f15eb28630e5c74935e7b15e95fc48f6768a4f490d6ad5cb75604f7" diff --git a/pyproject.toml b/pyproject.toml index 32063d68..6fd3bb50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,8 +41,7 @@ isort = ">=5.10" # flake8 plugins should be listed here (in alphabetical order) flake8-black = ">=0.2.1" flake8-docstrings = ">=1.5.0" -flake8-import-order = ">=0.18.1,<0.19.0" # we're not compatible with 0.19.0 yet due to #226 -setuptools = "<82" # flake8-import-order 0.18.x needs pkg_resources which was removed in setuptools v82 +flake8-import-order = "^0.19.2" flake8-tidy-imports = ">=4.11.0" pep8-naming = ">=0.11.1" diff --git a/tests/test_cli/test_bare.py b/tests/test_cli/test_bare.py index 91c90598..29960ff0 100644 --- a/tests/test_cli/test_bare.py +++ b/tests/test_cli/test_bare.py @@ -5,13 +5,13 @@ def test_no_args_prints_help(styleguide): """Tests that running the styleguide without any arguments prints the help info.""" result = styleguide() - assert result - assert result.output.startswith("Usage:") + assert not result.exception + assert "Usage:" in result.output def test_help_prints_help(styleguide): """Tests that running the styleguide with "--help" prints the help info.""" result = styleguide("--help") - assert result + assert not result.exception assert result.output.startswith("Usage:")