From 098c2287255d7d9116892836ce799b7c00720d67 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 16:55:54 +0000 Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 21.5b1 → 21.5b2](https://github.com/psf/black/compare/21.5b1...21.5b2) - [github.com/asottile/pyupgrade: v2.16.0 → v2.19.0](https://github.com/asottile/pyupgrade/compare/v2.16.0...v2.19.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d0ff787a..125c11f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 21.5b1 + rev: 21.5b2 hooks: - id: black @@ -43,7 +43,7 @@ repos: args: ["--python-version=3.7", "--ignore-missing-imports", "--scripts-are-modules"] - repo: https://github.com/asottile/pyupgrade - rev: v2.16.0 + rev: v2.19.0 hooks: - id: pyupgrade name: PyUpgrade 3.6+ From e734d66aa15631adcd8a5d9b61f66c640737843d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 16:56:12 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- bin/update_pythons.py | 4 ++-- test/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/update_pythons.py b/bin/update_pythons.py index eb813344..c21b0823 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -165,11 +165,11 @@ class PyPyVersions: version = release["python_version"] identifier = f"pp{version.major}{version.minor}-macosx_x86_64" - (url,) = [ + (url,) = ( rf["download_url"] for rf in release["files"] if "" in rf["platform"] == "darwin" and rf["arch"] == "x64" - ] + ) return ConfigMacOS( identifier=identifier, diff --git a/test/utils.py b/test/utils.py index 136b26cb..4854d259 100644 --- a/test/utils.py +++ b/test/utils.py @@ -150,10 +150,10 @@ def expected_wheels( platform_tags = [ ".".join( - [ + f"{manylinux_version}_{architecture}" for manylinux_version in manylinux_versions - ] + ) for architecture in architectures ] From 7eae1da5a5f728c1e682033abbf93a6e8f4b9a16 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Mon, 31 May 2021 13:49:46 -0400 Subject: [PATCH 3/3] 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 ]