From fccc309b74b84d4da89471e695d813a8c5bfbca8 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 23 Jan 2017 15:27:56 -0500 Subject: [PATCH] test for comments in reqs files #35 --- pipenv/cli.py | 13 +++++++++---- tests/requirements_django.txt | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pipenv/cli.py b/pipenv/cli.py index ade68298..7c500e39 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -64,6 +64,15 @@ def ensure_project(dev=False): ensure_virtualenv() +def clean_requirement(requirement): + """Cleans given requirement from additional data like, comments.""" + 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.""" + return [clean_requirement(p) for p in r.read().split('\n') if p and not p.startswith('#')] + + def do_where(virtualenv=False, bare=True): """Executes the where functionality.""" @@ -296,10 +305,6 @@ def which_pip(allow_global=False): return which('pip') -def from_requirements_file(r): - """Returns a list of packages from an open requirements file.""" - return [p for p in r.read().split('\n') if p and not p.startswith('#')] - @click.group(invoke_without_command=True) diff --git a/tests/requirements_django.txt b/tests/requirements_django.txt index 1efacc53..11befb39 100644 --- a/tests/requirements_django.txt +++ b/tests/requirements_django.txt @@ -1 +1 @@ -Django>1.10 +Django>1.10 #django