Merge pull request #1817 from rconradharris/stable-sort-hashes

Pipfile.lock hashes back to determinitic order
This commit is contained in:
Dan Ryan
2018-03-22 19:10:58 -04:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1070,7 +1070,7 @@ def do_lock(
{dep['name']: {'version': '=={0}'.format(dep['version'])}}
)
# Add Hashes to lockfile
lockfile['develop'][dep['name']]['hashes'] = sorted(dep['hashes'])
lockfile['develop'][dep['name']]['hashes'] = dep['hashes']
# Add index metadata to lockfile.
if 'index' in dep:
lockfile['develop'][dep['name']]['index'] = dep['index']
@@ -1126,7 +1126,7 @@ def do_lock(
{dep['name']: {'version': '=={0}'.format(dep['version'])}}
)
# Add Hashes to lockfile
lockfile['default'][dep['name']]['hashes'] = sorted(dep['hashes'])
lockfile['default'][dep['name']]['hashes'] = dep['hashes']
# Add index metadata to lockfile.
if 'index' in dep:
lockfile['default'][dep['name']]['index'] = dep['index']
+1 -1
View File
@@ -496,7 +496,7 @@ def resolve_deps(
except (ValueError, KeyError, ConnectionError, IndexError):
if verbose:
print('Error generating hash for {}'.format(name))
collected_hashes = list(set(collected_hashes))
collected_hashes = sorted(set(collected_hashes))
d = {'name': name, 'version': version, 'hashes': collected_hashes}
if index:
d.update({'index': index})