Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -11,7 +11,7 @@ python:
 # command to install dependencies
 install:
   - "pip install -e . --upgrade"
-  - "pipenv install --dev --skip-lock"
+  - "pipenv install --dev"
 
 # command to run the dependencies
 script:

HISTORY.txt

@@ -1,3 +1,6 @@
+6.0.3:
+ - Major bug fix.
+ - Fix for Daniel Ryan's weird corner case.
 6.0.2:
  - Fix Python 2 regression.
 6.0.1:

Pipfile

@@ -13,6 +13,8 @@ pytest = "*"
 pip-tools = "*"
 semver = "*"
 requests = "*"
+ibm-db-sa-py3 = ">=0.3.1-1"
+"-e ." = "*"
 
 [requires]
 python_version = "3.6"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b5f343e58b5bbac6a49682a73657e46260e05061235fff63ac3de78ff8c2a315"
+            "sha256": "e9ae7da6e599b7551d61f2f0d46c9f1894b08c30b0e9a005aca2c653bb967d9e"
         },
         "host-environment-markers": {
             "implementation_name": "cpython",
@@ -56,6 +56,10 @@
             ],
             "version": "==2.0.1"
         },
+        "ibm-db-sa-py3": {
+            "hashes": [],
+            "version": "==0.3.1-1"
+        },
         "idna": {
             "hashes": [
                 "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4",
@@ -84,6 +88,13 @@
             ],
             "version": "==1.9.0"
         },
+        "pipenv": {
+            "hashes": [
+                "sha256:ca20bb3fb6613b6e59f3dc8a94ad00336b4ac94af8b6df59a0539db8fdf0bd9c",
+                "sha256:e2162f30654cf1117900147fb4606199d29f281aee46f80d50ae287134c902ad"
+            ],
+            "version": "==6.0.3"
+        },
         "py": {
             "hashes": [
                 "sha256:2ccb79b01769d99115aa600d7eed99f524bf752bba8f041dc1c184853514655a",
@@ -93,10 +104,10 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:82c1e44a964ec5922c7c3891787df31c8c4f18b6c97a722df56b6cf20bb38c8a",
-                "sha256:4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce"
+                "sha256:b84f554f8ddc23add65c411bf112b2d88e2489fd45f753b1cae5936358bdf314",
+                "sha256:f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a"
             ],
-            "version": "==3.2.1"
+            "version": "==3.2.2"
         },
         "pythonz-bd": {
             "hashes": [
@@ -133,6 +144,12 @@
             ],
             "version": "==1.10.0"
         },
+        "sqlalchemy": {
+            "hashes": [
+                "sha256:f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e"
+            ],
+            "version": "==1.1.14"
+        },
         "urllib3": {
             "hashes": [
                 "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
@@ -297,10 +314,10 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:82c1e44a964ec5922c7c3891787df31c8c4f18b6c97a722df56b6cf20bb38c8a",
-                "sha256:4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce"
+                "sha256:b84f554f8ddc23add65c411bf112b2d88e2489fd45f753b1cae5936358bdf314",
+                "sha256:f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a"
             ],
-            "version": "==3.2.1"
+            "version": "==3.2.2"
         },
         "pytz": {
             "hashes": [

pipenv/__version__.py

@@ -3,4 +3,4 @@
 #  //___/ / / / //___/ / //       //   / /  || / /
 # //       / / //       ((____   //   / /   ||/ /
 
-__version__ = '6.0.2'
+__version__ = '6.0.3'

pipenv/cli.py

@@ -259,6 +259,8 @@ def do_install_dependencies(dev=False, only=False, bare=False, requirements=Fals
         with open(project.lockfile_location) as f:
             lockfile = split_vcs(json.load(f))
 
+    no_deps = (not skip_lock)
+
     # Install default dependencies, always.
     deps = lockfile['default'] if not only else {}
     vcs_deps = lockfile.get('default-vcs', {})
@@ -287,7 +289,7 @@ def do_install_dependencies(dev=False, only=False, bare=False, requirements=Fals
     # pip install:
     for dep, ignore_hash in progress.bar(deps_list):
 
-        c = pip_install(dep, ignore_hashes=ignore_hash, allow_global=allow_global)
+        c = pip_install(dep, ignore_hashes=ignore_hash, allow_global=allow_global, no_deps=no_deps)
 
         if c.return_code != 0:
             click.echo(crayons.red('An error occured while installing!'))

pipenv/utils.py

@@ -63,7 +63,7 @@ def resolve_deps(deps, sources=None, verbose=False, hashes=False):
     for req, _hash in _hashes.items():
         resolved_hashes[pep423_name(req.name)] = {
             'version': clean_pkg_version(req.specifier),
-            'hashes': list(_hash)
+            'hashes': _hash
         }
 
     for result in r.resolve():
@@ -80,7 +80,10 @@ def resolve_deps(deps, sources=None, verbose=False, hashes=False):
                 collected_hashes = ['sha256:' + s for s in collected_hashes]
                 # Add pypi resolved hashes
                 if name in resolved_hashes and resolved_hashes[name]['version'] == version:
-                    collected_hashes.extend(resolved_hashes[name]['hashes'])
+                    # Eliminate potential duplicate hashes
+                    _resolved = resolved_hashes[name]['hashes']
+                    _resolved |= set(collected_hashes)
+                    collected_hashes = list(_resolved)
 
                 results.append({'name': name, 'version': version, 'hashes': collected_hashes})
             except ValueError: