From 1d6ad0d6edcb0e75e998537e8cdef3fd6ba7f4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Socho=C5=84?= Date: Sun, 25 Mar 2018 23:28:04 +0200 Subject: [PATCH] Provide automatic removal of pkg-resources==0.0.0 Should help to deal with that pretty paintuly issue under Ubuntu/Debian family: https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463 --- pre_commit_hooks/requirements_txt_fixer.py | 5 +++++ tests/requirements_txt_fixer_test.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pre_commit_hooks/requirements_txt_fixer.py b/pre_commit_hooks/requirements_txt_fixer.py index 1ee6fac..623fede 100644 --- a/pre_commit_hooks/requirements_txt_fixer.py +++ b/pre_commit_hooks/requirements_txt_fixer.py @@ -69,6 +69,11 @@ def fix_requirements(f): else: rest = [] + for requirement in requirements: + if b'pkg-resources' in requirement.name: + if b'0.0.0' in requirement.value: + requirements.remove(requirement) + for requirement in sorted(requirements): after.extend(requirement.comments) after.append(requirement.value) diff --git a/tests/requirements_txt_fixer_test.py b/tests/requirements_txt_fixer_test.py index 87e7b0c..437cebd 100644 --- a/tests/requirements_txt_fixer_test.py +++ b/tests/requirements_txt_fixer_test.py @@ -28,6 +28,8 @@ from pre_commit_hooks.requirements_txt_fixer import Requirement FAIL, b'Django\n-e git+ssh://git_url@tag#egg=ocflib\nPyMySQL\n', ), + (b'bar\npkg-resources==0.0.0\nfoo\n', FAIL, b'bar\nfoo\n'), + (b'foo\npkg-resources==0.0.0\nbar\n', FAIL, b'bar\nfoo\n'), ), ) def test_integration(input_s, expected_retval, output, tmpdir):