From 7eae1da5a5f728c1e682033abbf93a6e8f4b9a16 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Mon, 31 May 2021 13:49:46 -0400 Subject: [PATCH] style: more stable ordering of checks --- .pre-commit-config.yaml | 24 ++++++++++++------------ test/utils.py | 6 ++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 125c11f3..044c47df 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,6 +13,18 @@ repos: - id: mixed-line-ending - id: trailing-whitespace +- repo: https://github.com/asottile/pyupgrade + rev: v2.19.0 + hooks: + - id: pyupgrade + name: PyUpgrade 3.6+ + args: ["--py36-plus"] + exclude: ^bin/ + - id: pyupgrade + name: PyUpgrade 3.7+ on bin + exclude: ^(cibuildwheel|unit_test|test)/ + args: ["--py37-plus"] + - repo: https://github.com/PyCQA/isort rev: 5.8.0 hooks: @@ -42,18 +54,6 @@ repos: additional_dependencies: [packaging] args: ["--python-version=3.7", "--ignore-missing-imports", "--scripts-are-modules"] -- repo: https://github.com/asottile/pyupgrade - rev: v2.19.0 - hooks: - - id: pyupgrade - name: PyUpgrade 3.6+ - args: ["--py36-plus"] - exclude: ^bin/ - - id: pyupgrade - name: PyUpgrade 3.7+ on bin - exclude: ^(cibuildwheel|unit_test|test)/ - args: ["--py37-plus"] - - repo: https://github.com/PyCQA/flake8 rev: 3.9.2 hooks: diff --git a/test/utils.py b/test/utils.py index 4854d259..c1baf4d9 100644 --- a/test/utils.py +++ b/test/utils.py @@ -150,10 +150,8 @@ def expected_wheels( platform_tags = [ ".".join( - - f"{manylinux_version}_{architecture}" - for manylinux_version in manylinux_versions - + f"{manylinux_version}_{architecture}" + for manylinux_version in manylinux_versions ) for architecture in architectures ]