summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Bienkowski <hexagonrecursion@gmail.com>2021-02-10 11:45:29 +0300
committerAndrey Bienkowski <hexagonrecursion@gmail.com>2021-02-10 11:45:29 +0300
commit264a65da801dd6e96937b1d50acffba92c911092 (patch)
tree92d0b987dc3d3bb01f138012f9bf8f4f5d67b31e
parentbbf8466088655d22cd46b286c8f0b8150754c1d9 (diff)
downloadpip-264a65da801dd6e96937b1d50acffba92c911092.tar.gz
Use the set literal syntax
-rw-r--r--news/8597c433-9c0b-4bec-a1e8-afd31786eaeb.trivial.rst0
-rw-r--r--tests/functional/test_new_resolver.py14
-rw-r--r--tests/unit/test_req_uninstall.py4
3 files changed, 9 insertions, 9 deletions
diff --git a/news/8597c433-9c0b-4bec-a1e8-afd31786eaeb.trivial.rst b/news/8597c433-9c0b-4bec-a1e8-afd31786eaeb.trivial.rst
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/news/8597c433-9c0b-4bec-a1e8-afd31786eaeb.trivial.rst
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
index 4d2acbb23..92a00f74a 100644
--- a/tests/functional/test_new_resolver.py
+++ b/tests/functional/test_new_resolver.py
@@ -16,23 +16,23 @@ from tests.lib.wheel import make_wheel
def assert_installed(script, **kwargs):
ret = script.pip('list', '--format=json')
- installed = set(
+ installed = {
(canonicalize_name(val['name']), val['version'])
for val in json.loads(ret.stdout)
- )
- expected = set((canonicalize_name(k), v) for k, v in kwargs.items())
+ }
+ expected = {(canonicalize_name(k), v) for k, v in kwargs.items()}
assert expected <= installed, f"{expected!r} not all in {installed!r}"
def assert_not_installed(script, *args):
ret = script.pip("list", "--format=json")
- installed = set(
+ installed = {
canonicalize_name(val["name"])
for val in json.loads(ret.stdout)
- )
+ }
# None of the given names should be listed as installed, i.e. their
# intersection should be empty.
- expected = set(canonicalize_name(k) for k in args)
+ expected = {canonicalize_name(k) for k in args}
assert not (expected & installed), f"{expected!r} contained in {installed!r}"
@@ -40,7 +40,7 @@ def assert_editable(script, *args):
# This simply checks whether all of the listed packages have a
# corresponding .egg-link file installed.
# TODO: Implement a more rigorous way to test for editable installations.
- egg_links = set(f"{arg}.egg-link" for arg in args)
+ egg_links = {f"{arg}.egg-link" for arg in args}
assert egg_links <= set(os.listdir(script.site_packages_path)), \
f"{args!r} not all found in {script.site_packages_path!r}"
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index 90bf0d50f..6923d34b8 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -162,9 +162,9 @@ class TestUninstallPathSet:
pth.add(share_com)
# Check that the paths were added to entries
if on_windows:
- check = set([tmpdir, relative, share, share_com])
+ check = {tmpdir, relative, share, share_com}
else:
- check = set([tmpdir, relative])
+ check = {tmpdir, relative}
assert pth.entries == check
@pytest.mark.skipif("sys.platform == 'win32'")