diff --git a/HISTORY.txt b/HISTORY.txt index a2106db9..66e4fe5e 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,7 +1,5 @@ 3.2.5: - Significant speed improvements for pipenv run and pipenv shell. - - Shell completion via click-completion. - - Perform package name normalization as best effort attempt. 3.2.4: - $ pipenv uninstall --all - Don't uninstall setuptools, wheel, pip, or six. diff --git a/Pipfile b/Pipfile index f6aee2a7..394700d3 100644 --- a/Pipfile +++ b/Pipfile @@ -1,3 +1,6 @@ +[dev-packages] +pytest = "*" + [packages] click = "*" crayons = "*" diff --git a/README.rst b/README.rst index d69a56d7..c22281da 100644 --- a/README.rst +++ b/README.rst @@ -58,16 +58,6 @@ Other Commands - ``run`` will run a given command from the virtualenv, with any arguments forwarded (e.g. ``$ pipenv run python``). - ``check`` asserts that PEP 508 requirements are being met by the current environment. -Shell Completion -//////////////// - -Set ``_PIPENV_COMPLETE`` and then source the output of the program. For example, with fish, put this -in your ``~/.config/fish/completions/pipenv.fish``:: - - eval (env _PIPENV_COMPLETE=source-fish pipenv) - -Magic shell completions are now enabled! - Caveats /////// diff --git a/pipenv/__version__.py b/pipenv/__version__.py index 0223f2dc..f8b8c35f 100644 --- a/pipenv/__version__.py +++ b/pipenv/__version__.py @@ -1 +1 @@ -__version__ = '3.2.5' +__version__ = '3.2.TEST' diff --git a/pipenv/cli.py b/pipenv/cli.py index fce1cfa5..d166f7c7 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -8,7 +8,6 @@ import shutil import signal import click -import click_completion import crayons import delegator import parse @@ -33,8 +32,6 @@ if sys.version_info < (3, 3): else: from shutil import get_terminal_size -# Enable shell completion. -click_completion.init() # Disable warnings for Python 2.6. requests.packages.urllib3.disable_warnings(InsecureRequestWarning) @@ -109,14 +106,8 @@ def ensure_proper_casing(): # Replace each package with proper casing. for dep in p[section].keys(): - # Attempt to normalize name from PyPI. - # Use provided name if better one can't be found. - try: - # Get new casing for package name. - new_casing = proper_case(dep) - except IOError: - # Unable to normalize package name. - continue + # Get new casing for package name. + new_casing = proper_case(dep) if new_casing == dep: continue diff --git a/setup.py b/setup.py index fc09882a..7dfb10bc 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,7 @@ if sys.argv[-1] == "publish": required = [ 'crayons', 'toml', - 'click>=6.7', - 'click-completion', + 'click', 'pip', 'parse', 'virtualenv', @@ -35,7 +34,7 @@ required = [ 'requirements-parser', 'pexpect', 'pipfile==0.0.1', - 'requests>=2.4.0' + 'requests' ] # Backport required for earlier versions of Python. diff --git a/tests/requirements_requests.txt b/tests/requirements_requests.txt index ff02e683..f2293605 100644 --- a/tests/requirements_requests.txt +++ b/tests/requirements_requests.txt @@ -1 +1 @@ -requests>2.3.0 +requests