Skip to content

Commit

Permalink
Merge pull request #2064 from dstufft/pr-2062
Browse files Browse the repository at this point in the history
reverse the deprecation of --build and --no-clean
  • Loading branch information
dstufft committed Sep 26, 2014
2 parents 05c7fa8 + 40bdaa7 commit cd277a5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
8 changes: 6 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* **PROCESS** Version numbers are now simply ``X.Y`` where the leading ``1``
has been dropped.

* Fixed :issue:`1873`. Silence byte compile errors when installation succeed.

* **BACKWARD INCOMPATIBLE** Dropped support for Python 3.1.

* **BACKWARD INCOMPATIBLE** Removed the bundle support which was deprecated in
Expand All @@ -22,6 +20,12 @@
until their removal in pip v8.0. For more information please see
https://pip.pypa.io/en/latest/reference/pip_install.html#caching

* **DEPRECATION** ``pip install --build`` and ``pip install --no-clean`` are now
*NOT* deprecated. This reverses the deprecation that occurred in v1.5.3. See
:issue:`906` for discussion.

* Fixed :issue:`1873`. Silence byte compile errors when installation succeed.

* Added a virtualenv-specific configuration file. (:pull:`1364`)

* Added site-wide configuation files. (:pull:`1978`)
Expand Down
11 changes: 4 additions & 7 deletions pip/commands/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import warnings

from pip.req import InstallRequirement, RequirementSet, parse_requirements
from pip.locations import (virtualenv_no_global, distutils_scheme,
build_prefix)
from pip.locations import virtualenv_no_global, distutils_scheme
from pip.basecommand import Command
from pip.index import PackageFinder
from pip.exceptions import (
Expand Down Expand Up @@ -199,13 +198,11 @@ def run(self, options, args):

if (
options.no_install or
options.no_download or
(options.build_dir != build_prefix) or
options.no_clean
options.no_download
):
warnings.warn(
"--no-install, --no-download, --build, and --no-clean are "
"deprecated. See https://github.com/pypa/pip/issues/906.",
"--no-install and --no-download are deprecated. "
"See https://github.com/pypa/pip/issues/906.",
RemovedInPip7Warning,
)

Expand Down

0 comments on commit cd277a5

Please sign in to comment.