From 9cd43ac9220c47883616729bb3f1fddbecfc6a7f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 23 Jan 2017 15:42:43 -0500 Subject: [PATCH] better support for comments in requirements files #45 --- pipenv/cli.py | 2 +- test_pipenv.py | 5 +++++ tests/requirements_egg.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/requirements_egg.txt diff --git a/pipenv/cli.py b/pipenv/cli.py index 7c500e39..6eaf92ae 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -66,7 +66,7 @@ def ensure_project(dev=False): def clean_requirement(requirement): """Cleans given requirement from additional data like, comments.""" - return requirement[:requirement.index('#') - 1].strip() if ' #' in requirement else requirement.strip() + return requirement[:requirement.index(' #') - 1].strip() if ' #' in requirement else requirement.strip() def from_requirements_file(r): """Returns a list of packages from an open requirements file.""" diff --git a/test_pipenv.py b/test_pipenv.py index cf187833..4d7ca0f5 100644 --- a/test_pipenv.py +++ b/test_pipenv.py @@ -75,3 +75,8 @@ def test_install_from_requirements_file(): r = open('tests/requirements_requests_socks.txt') dep = from_requirements_file(r) assert dep == ['requests[socks]'] + + # -e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject # comment + r = open('tests/requirements_egg.txt') + dep = from_requirements_file(r) + assert dep == ['-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject'] diff --git a/tests/requirements_egg.txt b/tests/requirements_egg.txt new file mode 100644 index 00000000..aeeb5d2c --- /dev/null +++ b/tests/requirements_egg.txt @@ -0,0 +1 @@ +-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject # comment \ No newline at end of file