From 1a976166100709f922ae6db3a091fc187054d5b3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 24 Jan 2017 15:52:37 -0500 Subject: [PATCH 1/4] remove pipenv install -r --- pipenv/cli.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pipenv/cli.py b/pipenv/cli.py index 43aa179f..4cc36bff 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -68,24 +68,12 @@ def ensure_virtualenv(three=None): ensure_virtualenv(three=three) - - def ensure_project(dev=False, three=None): """Ensures both Pipfile and virtualenv exist for the project.""" ensure_pipfile(dev=dev) ensure_virtualenv(three=three) -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.""" - # Ignore Comment lines, ignore -i lines. - return [clean_requirement(p) for p in r.read().split('\n') if p and not p.startswith('#') and not p.startswith('-i')] - - def do_where(virtualenv=False, bare=True): """Executes the where functionality.""" @@ -384,7 +372,6 @@ def cli(ctx, where=False, bare=False, three=False, help=False): @click.argument('package_name', default=False) @click.argument('more_packages', nargs=-1) @click.option('--dev','-d', is_flag=True, default=False, help="Install package(s) in [dev-packages].") -@click.option('-r', type=click.File('r'), default=None, help="Use requirements.txt file.") @click.option('--three/--two', is_flag=True, default=None, help="Use Python 3/2 when creating virtualenv.") @click.option('--system', is_flag=True, default=False, help="System pip management.") def install(package_name=False, more_packages=False, r=False, dev=False, three=False, system=False): @@ -395,11 +382,6 @@ def install(package_name=False, more_packages=False, r=False, dev=False, three=F # Allow more than one package to be provided. package_names = (package_name,) + more_packages - # If -r provided, read in package names. - if r: - package_names = from_requirements_file(r) - package_name = package_names.pop() - # Install all dependencies, if none was provided. if package_name is False: click.echo(crayons.yellow('No package provided, installing all dependencies.')) From c0816d1c4a919b47ccbb1f97aedfd5ed87abb348 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 24 Jan 2017 15:55:04 -0500 Subject: [PATCH 2/4] fix bug with lock --- pipenv/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipenv/cli.py b/pipenv/cli.py index 4cc36bff..187abfbc 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -102,8 +102,8 @@ def do_install_dependencies(dev=False, only=False, bare=False, allow_global=Fals # Load the Pipfile. p = pipfile.load(project.pipfile_location) - # Load the lockfile if it exists, else use the Pipfile as a seed. - if not project.lockfile_exists: + # Load the lockfile if it exists, or if only is being used (e.g. lock is being used). + if only or not project.lockfile_exists: if not bare: click.echo(crayons.yellow('Installing dependencies from Pipfile...')) lockfile = json.loads(p.lock()) From 76d1cf7578ea96771de98937a4a930e2c94b5e60 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 24 Jan 2017 15:55:44 -0500 Subject: [PATCH 3/4] history --- HISTORY.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HISTORY.txt b/HISTORY.txt index bc805170..78894125 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,3 +1,6 @@ +0.3.0: + - Lock fix. + - Removed $ pipenv install -r functionality. 0.2.9: - Enhanced–enhanced PEP 508 checking capabilities! 0.2.8: From 504fdedbf7f4a14a527aa919a4a4a91621424e3c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 24 Jan 2017 15:55:57 -0500 Subject: [PATCH 4/4] v3.0.0 --- pipenv/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/__version__.py b/pipenv/__version__.py index 6c8aff61..e931652e 100644 --- a/pipenv/__version__.py +++ b/pipenv/__version__.py @@ -1 +1 @@ -__version__ = '0.2.9' \ No newline at end of file +__version__ = '3.0.0' \ No newline at end of file