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

Fix tests failures

Browse Source
This commit is contained in:
frostming
2018-03-28 17:43:53 +08:00
committed by Frost Ming
parent 29e9b237ae
commit 3c0770fb7a
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/core.py
+4 -5
View File
@@ -2036,11 +2036,10 @@ def do_uninstall(
c = delegator.run(cmd)
click.echo(crayons.blue(c.out))
if pipfile_remove:
norm_name = pep423_name(package_name)
in_dev_packages = (
norm_name in project._pipfile.get('dev-packages', {})
)
in_packages = (norm_name in project._pipfile.get('packages', {}))
in_packages = project.get_package_name_in_pipfile(
package_name, dev=False)
in_dev_packages = project.get_package_name_in_pipfile(
package_name, dev=True)
if not in_dev_packages and not in_packages:
click.echo(
'No package {0} to remove from Pipfile.'.format(
pipenv/project.py
+18 -16
View File
@@ -591,17 +591,23 @@ class Project(object):
except OSError:
pass
def get_package_name_in_pipfile(self, package_name, dev=False):
"""Get the equivalent package name in pipfile"""
key = 'dev-packages' if dev else 'packages'
section = self.parsed_pipfile.get(key, {})
for name in section.keys():
if pep423_name(name) == pep423_name(package_name):
return name
return None
def remove_package_from_pipfile(self, package_name, dev=False):
# Read and append Pipfile.
p = self.parsed_pipfile
package_name = pep423_name(package_name)
name = self.get_package_name_in_pipfile(package_name, dev)
key = 'dev-packages' if dev else 'packages'
if key in p:
for name in dict(p[key]):
if pep423_name(name) == package_name:
del p[key][name]
# Write Pipfile.
return self.write_toml(p)
p = self.parsed_pipfile
if name:
del p[key][name]
self.write_toml(p)
def add_package_to_pipfile(self, package_name, dev=False):
# Read and append Pipfile.
@@ -619,14 +625,10 @@ class Project(object):
p[key] = {}
package = convert_deps_from_pip(package_name)
package_name = [k for k in package.keys()][0]
for name in dict(p[key]):
# Normalize names to compare
if (
pep423_name(name) == pep423_name(package_name) and
name != package_name
):
# Replace the package name
del p[key][name]
name = self.get_package_name_in_pipfile(package_name, dev)
if name and name != package_name:
# Replace the packge name
del p[key][name]
# Add the package to the group.
p[key][package_name] = package[package_name]
# Write Pipfile.