From eff595f1728a395bb23e27dbe32f15320921b6c7 Mon Sep 17 00:00:00 2001 From: Greg Brown Date: Tue, 26 Sep 2017 14:49:42 +1300 Subject: [PATCH 1/3] typo --- docs/advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index b91a3cf1..a92af3a0 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -399,7 +399,7 @@ If a ``.env`` file is present in your project, ``$ pipenv shell`` and ``$ pipenv 'WORLD' This is very useful for keeping production credentials out of your codebase. -We do not recommend comitting ``.env`` files into source control! +We do not recommend committing ``.env`` files into source control! .. _proper_installation: From 41d9da6447a70e6ab03c943ed44e2e4119b9e959 Mon Sep 17 00:00:00 2001 From: Brightcells Date: Tue, 26 Sep 2017 14:41:49 +0800 Subject: [PATCH 2/3] typo --- docs/advanced.rst | 6 +++--- docs/basics.rst | 2 +- pipenv/cli.py | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index a92af3a0..20579640 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -238,7 +238,7 @@ Here's a more complex example:: [packages] unittest2 = {version = ">=1.0,<3.0", markers="python_version < '2.7.9' or (python_version >= '3.0' and python_version < '3.4')"} -Magic. Pure, unalderated magic. +Magic. Pure, unadulterated magic. @@ -453,7 +453,7 @@ To upgrade pipenv at any time:: ☤ Crude Installation of Pipenv ------------------------------ -If you don't even have pip installed, you can use this crude installation method, which will boostrap your whole system:: +If you don't even have pip installed, you can use this crude installation method, which will bootstrap your whole system:: $ curl https://raw.githubusercontent.com/kennethreitz/pipenv/master/get-pipenv.py | python @@ -483,7 +483,7 @@ The user can provide these additional parameters: - ``--two`` — Performs the installation in a virtualenv using the system ``python2`` link. - ``--three`` — Performs the installation in a virtualenv using the system ``python3`` link. - - ``--python`` — Performs the installation in a virtualenv using the provided Python intepreter. + - ``--python`` — Performs the installation in a virtualenv using the provided Python interpreter. .. warning:: None of the above commands should be used together. They are also **destructive** and will delete your current virtualenv before replacing diff --git a/docs/basics.rst b/docs/basics.rst index 750a8e9e..cf41710f 100644 --- a/docs/basics.rst +++ b/docs/basics.rst @@ -22,7 +22,7 @@ managing development and testing environments for any kind of project. ☤ Make sure you've got Python & pip ------------------------------------ -Before you go any further, make sure you have Python and that it's avalable +Before you go any further, make sure you have Python and that it's available from your command line. You can check this by simply running: .. code-block:: bash diff --git a/pipenv/cli.py b/pipenv/cli.py index 38ffb473..5d36a466 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -88,7 +88,7 @@ if not PIPENV_HIDE_EMOJIS: if ((now.tm_mon == 10) and (now.tm_day == 30)) or ((now.tm_mon == 10) and (now.tm_day == 31)): INSTALL_LABEL = '🎃 ' - # Chrismas easter-egg. + # Christmas easter-egg. elif ((now.tm_mon == 12) and (now.tm_day == 24)) or ((now.tm_mon == 12) and (now.tm_day == 25)): INSTALL_LABEL = '🎅 ' @@ -653,7 +653,7 @@ def do_where(virtualenv=False, bare=True): if not virtualenv: location = project.pipfile_location - # Shorten the virual display of the path to the virtualenv. + # Shorten the virtual display of the path to the virtualenv. if not bare: location = shorten_path(location) @@ -697,7 +697,7 @@ def do_install_dependencies( if verbose: click.echo(crayons.blue(c.out or c.err)) - # The Installtion failed... + # The Installation failed... if c.return_code != 0: # Save the Failed Dependency for later. @@ -817,7 +817,7 @@ def do_install_dependencies( index=index ) - # The Installtion failed... + # The Installation failed... if c.return_code != 0: # We echo both c.out and c.err because pip returns error details on out. @@ -873,7 +873,7 @@ def do_create_virtualenv(python=None, site_packages=False): crayons.normal(u'to create virtualenv…', bold=True) )) - # Use virutalenv's -p python. + # Use virtualenv's -p python. if python: cmd = cmd + ['-p', python] @@ -2037,7 +2037,7 @@ def run(command, args, three=None, python=False): load_dot_env() - # Seperate out things that were passed in as a string. + # Separate out things that were passed in as a string. _c = list(command.split()) command = _c.pop(0) if _c: @@ -2067,7 +2067,7 @@ def run(command, args, three=None, python=False): ) sys.exit(1) - # Execute the comand. + # Execute the command. os.execl(command_path, command_path, *args) pass From f31a29fff9ffca859a6285fdf66e53b1253c9fa5 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Tue, 26 Sep 2017 01:18:09 -0700 Subject: [PATCH 3/3] use the same Pipfile we check against in pipfile_exists --- HISTORY.txt | 2 ++ pipenv/project.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HISTORY.txt b/HISTORY.txt index 828f4430..0e0e0017 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,3 +1,5 @@ +Unreleased: + - Fix issue with nested directories all containing Pipfiles. 8.0.1: - Fix weird edge case with ramuel.ordereddict. 8.0.0: diff --git a/pipenv/project.py b/pipenv/project.py index 69622655..0c040dd4 100644 --- a/pipenv/project.py +++ b/pipenv/project.py @@ -354,7 +354,7 @@ class Project(object): if not self.pipfile_exists: return True - with open('Pipfile', 'r') as f: + with open(self.pipfile_location, 'r') as f: if not f.read(): return True