Merge pull request #496 from kennethreitz/windows_patch

Windows patch

README.rst

@@ -15,6 +15,9 @@ Pipenv: Sacred Marriage of Pipfile, Pip, & Virtualenv
 
 .. image:: https://travis-ci.org/kennethreitz/pipenv.svg?branch=master
     :target: https://travis-ci.org/kennethreitz/pipenv
+    
+.. image:: https://img.shields.io/appveyor/ci/kennethreitz/pipenv.svg   
+    :target: https://ci.appveyor.com/project/kennethreitz/pipenv/branch/master
 
 .. image:: https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg
     :target: https://saythanks.io/to/kennethreitz

pipenv/__version__.py

@@ -3,4 +3,4 @@
 #  //___/ / / / //___/ / //       //   / /  || / /
 # //       / / //       ((____   //   / /   ||/ /
 
-__version__ = '6.1.5'
+__version__ = '6.1.6'

pipenv/cli.py

@@ -501,7 +501,6 @@ def get_downloads_info(names_map, section):
 
 def do_lock(no_hashes=True, verbose=False, legacy=False):
     """Executes the freeze functionality."""
-
     if not legacy:
         # Alert the user of progress.
         click.echo(crayons.yellow('Locking {0} dependencies...'.format(crayons.red('[dev-packages]'))), err=True)
@@ -580,7 +579,11 @@ def do_lock(no_hashes=True, verbose=False, legacy=False):
                 lockfile['default'][dep['name']]['hashes'] = dep['hashes']
 
     # Run the PEP 508 checker in the virtualenv, add it to the lockfile.
-    c = delegator.run('"{0}" {1}'.format(which('python'), shellquote(pep508checker.__file__.rstrip('cdo'))))
+    cmd = '"{0}" {1}'.format(which('python'), shellquote(pep508checker.__file__.rstrip('cdo')))
+    c = delegator.run(cmd)
+    # print("Cmd: {0}".format(cmd))
+    # print("Return Code: {0}".format(c.return_code))
+    # print("Out: {0}".format(c.out))
     lockfile['_meta']['host-environment-markers'] = json.loads(c.out)
 
     # Write out the lockfile.
@@ -1247,7 +1250,7 @@ def update(dev=False, three=None, python=None, dry_run=False, bare=False, dont_u
     ensure_project(three=three, python=python, validate=False)
     # --dry-run
     if dry_run:
-        dont_upgrade = True
+        # dont_upgrade = True
         updates = False
 
         # Dev packages

pipenv/utils.py

@@ -23,7 +23,7 @@ class PipCommand(pip.basecommand.Command):
 
 
 def shellquote(s):
-    return "'" + s.replace("'", "'\\''") + "'"
+    return '"' + s.replace("'", "'\\''") + '"'
 
 
 def clean_pkg_version(version):

test_windows/test_pipenv.py

@@ -151,7 +151,7 @@ class TestPipenvWindows():
         pipfile_output = delegator.run('type Pipfile').out
         pipfile_list = pipfile_output.split('\n')
 
-        assert 'Werkzeug = "*"' in pipfile_list
+        assert 'werkzeug = "*"' in pipfile_list
         assert 'pytest = "*"' in pipfile_list
         assert '[packages]' in pipfile_list
         assert '[dev-packages]' in pipfile_list
@@ -182,6 +182,8 @@ class TestPipenvWindows():
 
         # Build the environment.
         os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        assert delegator.run('copy /y nul Pipfile').return_code == 0
+        assert delegator.run('pipenv --python python').return_code == 0
 
         # Install packages for test.
         assert delegator.run('pipenv install pep8').return_code == 0