Skip to content

Commit 1f1e1d6

Browse files
committed
Remove deprecated --find-links option from pip freeze
1 parent 3b3fde2 commit 1f1e1d6

File tree

4 files changed

+1
-86
lines changed

4 files changed

+1
-86
lines changed

news/9069.removal.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove deprecated ``--find-links`` option in ``pip freeze``

src/pip/_internal/commands/freeze.py

-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from pip._internal.cli.status_codes import SUCCESS
88
from pip._internal.operations.freeze import freeze
99
from pip._internal.utils.compat import stdlib_pkgs
10-
from pip._internal.utils.deprecation import deprecated
1110

1211
DEV_PKGS = {'pip', 'setuptools', 'distribute', 'wheel'}
1312

@@ -34,14 +33,6 @@ def add_options(self):
3433
help="Use the order in the given requirements file and its "
3534
"comments when generating output. This option can be "
3635
"used multiple times.")
37-
self.cmd_opts.add_option(
38-
'-f', '--find-links',
39-
dest='find_links',
40-
action='append',
41-
default=[],
42-
metavar='URL',
43-
help='URL for finding packages, which will be added to the '
44-
'output.')
4536
self.cmd_opts.add_option(
4637
'-l', '--local',
4738
dest='local',
@@ -82,17 +73,8 @@ def run(self, options, args):
8273

8374
cmdoptions.check_list_path_option(options)
8475

85-
if options.find_links:
86-
deprecated(
87-
"--find-links option in pip freeze is deprecated.",
88-
replacement=None,
89-
gone_in="21.2",
90-
issue=9069,
91-
)
92-
9376
for line in freeze(
9477
requirement=options.requirements,
95-
find_links=options.find_links,
9678
local_only=options.local,
9779
user_only=options.user,
9880
paths=options.path,

src/pip/_internal/operations/freeze.py

-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
def freeze(
3737
requirement=None, # type: Optional[List[str]]
38-
find_links=None, # type: Optional[List[str]]
3938
local_only=False, # type: bool
4039
user_only=False, # type: bool
4140
paths=None, # type: Optional[List[str]]
@@ -44,10 +43,6 @@ def freeze(
4443
skip=() # type: Container[str]
4544
):
4645
# type: (...) -> Iterator[str]
47-
find_links = find_links or []
48-
49-
for link in find_links:
50-
yield f'-f {link}'
5146
installations = {} # type: Dict[str, FrozenRequirement]
5247

5348
for dist in get_installed_distributions(

tests/functional/test_freeze.py

-63
Original file line numberDiff line numberDiff line change
@@ -270,19 +270,6 @@ def test_freeze_git_clone(script, tmpdir):
270270
).strip()
271271
_check_output(result.stdout, expected)
272272

273-
result = script.pip(
274-
'freeze', '-f', f'{repo_dir}#egg=pip_test_package',
275-
expect_stderr=True,
276-
)
277-
expected = textwrap.dedent(
278-
"""
279-
-f {repo}#egg=pip_test_package...
280-
-e git+...#egg=version_pkg
281-
...
282-
""".format(repo=repo_dir),
283-
).strip()
284-
_check_output(result.stdout, expected)
285-
286273
# Check that slashes in branch or tag names are translated.
287274
# See also issue #1083: https://github.com/pypa/pip/issues/1083
288275
script.run(
@@ -335,19 +322,6 @@ def test_freeze_git_clone_srcdir(script, tmpdir):
335322
).strip()
336323
_check_output(result.stdout, expected)
337324

338-
result = script.pip(
339-
'freeze', '-f', f'{repo_dir}#egg=pip_test_package',
340-
expect_stderr=True,
341-
)
342-
expected = textwrap.dedent(
343-
"""
344-
-f {repo}#egg=pip_test_package...
345-
-e git+...#egg=version_pkg&subdirectory=subdir
346-
...
347-
""".format(repo=repo_dir),
348-
).strip()
349-
_check_output(result.stdout, expected)
350-
351325

352326
@need_mercurial
353327
def test_freeze_mercurial_clone_srcdir(script, tmpdir):
@@ -376,19 +350,6 @@ def test_freeze_mercurial_clone_srcdir(script, tmpdir):
376350
).strip()
377351
_check_output(result.stdout, expected)
378352

379-
result = script.pip(
380-
'freeze', '-f', f'{repo_dir}#egg=pip_test_package',
381-
expect_stderr=True,
382-
)
383-
expected = textwrap.dedent(
384-
"""
385-
-f {repo}#egg=pip_test_package...
386-
-e hg+...#egg=version_pkg&subdirectory=subdir
387-
...
388-
""".format(repo=repo_dir),
389-
).strip()
390-
_check_output(result.stdout, expected)
391-
392353

393354
@pytest.mark.git
394355
def test_freeze_git_remote(script, tmpdir):
@@ -482,19 +443,6 @@ def test_freeze_mercurial_clone(script, tmpdir):
482443
).strip()
483444
_check_output(result.stdout, expected)
484445

485-
result = script.pip(
486-
'freeze', '-f', f'{repo_dir}#egg=pip_test_package',
487-
expect_stderr=True,
488-
)
489-
expected = textwrap.dedent(
490-
"""
491-
-f {repo}#egg=pip_test_package...
492-
...-e hg+...#egg=version_pkg
493-
...
494-
""".format(repo=repo_dir),
495-
).strip()
496-
_check_output(result.stdout, expected)
497-
498446

499447
@need_bzr
500448
def test_freeze_bazaar_clone(script, tmpdir):
@@ -521,17 +469,6 @@ def test_freeze_bazaar_clone(script, tmpdir):
521469
...""")
522470
_check_output(result.stdout, expected)
523471

524-
result = script.pip(
525-
'freeze', '-f',
526-
f'{checkout_path}/#egg=django-wikiapp',
527-
expect_stderr=True,
528-
)
529-
expected = textwrap.dedent("""\
530-
-f {repo}/#egg=django-wikiapp
531-
...-e bzr+file://...@...#egg=version_pkg
532-
...""".format(repo=checkout_path))
533-
_check_output(result.stdout, expected)
534-
535472

536473
@need_mercurial
537474
@pytest.mark.git

0 commit comments

Comments
 (0)