kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for ryan

Browse Source 
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
Kenneth Reitz
2017-09-07 13:21:54 -04:00
parent 5624c342e3
commit 2ed0eb33c6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/cli.py
-1
View File
@@ -479,7 +479,6 @@ def do_lock(no_hashes=True, verbose=False, legacy=False):
# Resolve dev-package dependencies. # Resolve dev-package dependencies.
deps = convert_deps_to_pip(project.dev_packages, r=False) deps = convert_deps_to_pip(project.dev_packages, r=False)
results = resolve_deps(deps, sources=project.sources, verbose=verbose, hashes=(not no_hashes)) results = resolve_deps(deps, sources=project.sources, verbose=verbose, hashes=(not no_hashes))
# Add develop dependencies to lockfile. # Add develop dependencies to lockfile.
for dep in results: for dep in results:
lockfile['develop'].update({dep['name']: {'version': '=={0}'.format(dep['version'])}}) lockfile['develop'].update({dep['name']: {'version': '=={0}'.format(dep['version'])}})
pipenv/utils.py
+7 -2
View File
@@ -56,7 +56,7 @@ def resolve_deps(deps, sources=None, verbose=False, hashes=False):
for result in r.resolve(): for result in r.resolve():
name = pep423_name(result.name) name = pep423_name(result.name)
version = six.u(str(result.specifier)).replace('==', '') version = six.u(pep440_version(str(result.specifier))).replace('==', '')
if hashes: if hashes:
try: try:
@@ -242,9 +242,14 @@ def is_vcs(pipfile_entry):
return False return False
def pep440_version(version):
# TODO: https://github.com/pypa/pip/blob/a9d56c7734fd465d01437d61f632749a293e7805/src/pip/_vendor/distlib/version.py#L184
return version.replace('.post', '-')
def pep423_name(name): def pep423_name(name):
"""Normalize package name to PEP 423 style standard.""" """Normalize package name to PEP 423 style standard."""
return name.lower().replace('_','-') return name.lower().replace('_', '-')
def proper_case(package_name): def proper_case(package_name):