mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
Merge branch 'master' into bugfix/3786
This commit is contained in:
@@ -0,0 +1 @@
|
||||
Fix a bug where pipenv --clear is not working
|
||||
+6
-10
@@ -62,18 +62,15 @@ def cli(
|
||||
state,
|
||||
where=False,
|
||||
venv=False,
|
||||
rm=False,
|
||||
bare=False,
|
||||
three=False,
|
||||
python=False,
|
||||
help=False,
|
||||
py=False,
|
||||
envs=False,
|
||||
man=False,
|
||||
rm=False,
|
||||
bare=False,
|
||||
completion=False,
|
||||
pypi_mirror=None,
|
||||
man=False,
|
||||
support=None,
|
||||
clear=False,
|
||||
help=False,
|
||||
site_packages=False,
|
||||
**kwargs
|
||||
):
|
||||
# Handle this ASAP to make shell startup fast.
|
||||
@@ -143,10 +140,9 @@ def cli(
|
||||
get_pipenv_diagnostics()
|
||||
return 0
|
||||
# --clear was passed…
|
||||
elif clear:
|
||||
elif state.clear:
|
||||
do_clear()
|
||||
return 0
|
||||
|
||||
# --venv was passed…
|
||||
elif venv:
|
||||
# There is no virtualenv yet.
|
||||
|
||||
@@ -235,3 +235,19 @@ import flask
|
||||
c = p.pipenv('check --unused .')
|
||||
assert 'tablib' not in c.out
|
||||
assert 'flask' not in c.out
|
||||
|
||||
|
||||
@pytest.mark.cli
|
||||
def test_pipenv_clear(PipenvInstance):
|
||||
with PipenvInstance() as p:
|
||||
c = p.pipenv('--clear')
|
||||
assert c.return_code == 0
|
||||
assert 'Clearing caches' in c.out
|
||||
|
||||
|
||||
@pytest.mark.cli
|
||||
def test_pipenv_three(PipenvInstance):
|
||||
with PipenvInstance() as p:
|
||||
c = p.pipenv('--three')
|
||||
assert c.return_code == 0
|
||||
assert 'Successfully created virtual environment' in c.err
|
||||
|
||||
Reference in New Issue
Block a user