From cccfb25df4cc981b16c2506acf2eb140aa8ea6e1 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Sun, 21 Mar 2021 12:37:15 -0400
Subject: [PATCH] style: add pyupgrade to pre-commit

---
 .pre-commit-config.yaml  |  6 ++++++
 tests/test_markers.py    |  4 ++--
 tests/test_specifiers.py |  4 ++--
 tests/test_tags.py       | 12 +++++-------
 tests/test_version.py    |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index df47a8aba..49ae0d4e7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,6 +14,12 @@ repos:
         exclude: '^(docs|tasks|tests)|setup\.py'
         args: []
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.29.0
+    hooks:
+      - id: pyupgrade
+        args: [--py36-plus]
+
   - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
diff --git a/tests/test_markers.py b/tests/test_markers.py
index 64573a901..c2640afeb 100644
--- a/tests/test_markers.py
+++ b/tests/test_markers.py
@@ -68,7 +68,7 @@ def test_str(self, value):
 
     @pytest.mark.parametrize("value", ["one", "two", None, 3, 5, []])
     def test_repr(self, value):
-        assert repr(Node(value)) == "<Node({!r})>".format(str(value))
+        assert repr(Node(value)) == f"<Node({str(value)!r})>"
 
     def test_base_class(self):
         with pytest.raises(NotImplementedError):
@@ -205,7 +205,7 @@ def test_parses_invalid(self, marker_string):
     def test_str_and_repr(self, marker_string, expected):
         m = Marker(marker_string)
         assert str(m) == expected
-        assert repr(m) == "<Marker({!r})>".format(str(m))
+        assert repr(m) == f"<Marker({str(m)!r})>"
 
     def test_extra_with_no_extra_in_environment(self):
         # We can't evaluate an extra if no extra is passed into the environment
diff --git a/tests/test_specifiers.py b/tests/test_specifiers.py
index 0b8e742c1..ca21fa1de 100644
--- a/tests/test_specifiers.py
+++ b/tests/test_specifiers.py
@@ -227,7 +227,7 @@ def test_specifiers_str_and_repr(self, specifier, expected):
         spec = Specifier(specifier)
 
         assert str(spec) == expected
-        assert repr(spec) == "<Specifier({!r})>".format(expected)
+        assert repr(spec) == f"<Specifier({expected!r})>"
 
     @pytest.mark.parametrize("specifier", SPECIFIERS)
     def test_specifiers_hash(self, specifier):
@@ -873,7 +873,7 @@ def test_specifiers_str_and_repr(self, specifier, expected):
         spec = SpecifierSet(specifier)
 
         assert str(spec) == expected
-        assert repr(spec) == "<SpecifierSet({!r})>".format(expected)
+        assert repr(spec) == f"<SpecifierSet({expected!r})>"
 
     @pytest.mark.parametrize("specifier", SPECIFIERS + LEGACY_SPECIFIERS)
     def test_specifiers_hash(self, specifier):
diff --git a/tests/test_tags.py b/tests/test_tags.py
index 3b0d31708..c90ddbb8e 100644
--- a/tests/test_tags.py
+++ b/tests/test_tags.py
@@ -228,12 +228,10 @@ def test_version_detection(self, monkeypatch):
                 platform, "mac_ver", lambda: ("10.14", ("", "", ""), "x86_64")
             )
         version = platform.mac_ver()[0].split(".")
-        if version[0] == "10":
-            expected = "macosx_{major}_{minor}".format(
-                major=version[0], minor=version[1]
-            )
-        else:
-            expected = "macosx_{major}_{minor}".format(major=version[0], minor=0)
+        major = version[0]
+        minor = version[1] if major == 10 else "0"
+        expected = f"macosx_{major}_{minor}"
+
         platforms = list(tags.mac_platforms(arch="x86_64"))
         print(platforms, expected)
         assert platforms[0].startswith(expected)
@@ -608,7 +606,7 @@ def test__debug_cp38(self, debug, expected, monkeypatch):
     def test_pymalloc(self, pymalloc, version, result, monkeypatch):
         config = {"Py_DEBUG": 0, "WITH_PYMALLOC": pymalloc, "Py_UNICODE_SIZE": 2}
         monkeypatch.setattr(sysconfig, "get_config_var", config.__getitem__)
-        base_abi = "cp{}{}".format(version[0], version[1])
+        base_abi = f"cp{version[0]}{version[1]}"
         expected = [base_abi + "m" if result else base_abi]
         assert tags._cpython_abis(version) == expected
 
diff --git a/tests/test_version.py b/tests/test_version.py
index 8fe563290..5f2251e11 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -277,7 +277,7 @@ def test_normalized_versions(self, version, normalized):
     )
     def test_version_str_repr(self, version, expected):
         assert str(Version(version)) == expected
-        assert repr(Version(version)) == "<Version({!r})>".format(expected)
+        assert repr(Version(version)) == f"<Version({expected!r})>"
 
     def test_version_rc_and_c_equals(self):
         assert Version("1.0rc1") == Version("1.0c1")