Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGES.txt
	pip/__init__.py
  • Loading branch information
dstufft committed Jan 28, 2015
2 parents af8a7c9 + cfd03c1 commit 108f5db
Show file tree
Hide file tree
Showing 4 changed files with 19,850 additions and 19,579 deletions.
3 changes: 3 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Ian Bicking <[email protected]>
Igor Sobreira <[email protected]>
Ilya Baryshev <[email protected]>
INADA Naoki <[email protected]>
Ionel Cristian Mărieș <[email protected]>
Ionel Maries Cristian <[email protected]>
Jakub Stasiak <[email protected]>
Jakub Vysoky <[email protected]>
Expand Down Expand Up @@ -100,6 +101,7 @@ Kenneth Reitz <[email protected]>
Kevin Burke <[email protected]>
Kevin Frommelt <[email protected]>
Kumar McMillan <[email protected]>
Laurent Bristiel <[email protected]>
Leon Sasson <[email protected]>
Lev Givon <[email protected]>
Lincoln de Sousa <[email protected]>
Expand Down Expand Up @@ -130,6 +132,7 @@ Oren Held <[email protected]>
Oscar Benjamin <[email protected]>
Patrick Dubroy <[email protected]>
Patrick Jenkins <[email protected]>
patricktokeeffe <[email protected]>
Paul Moore <[email protected]>
Paul Nasrat <[email protected]>
Paul Oswald <[email protected]>
Expand Down
19 changes: 19 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@
otherwise fallback to the original ASCII based progress bar.


**6.0.7 (2015-01-28)**

* Fix a regression where Numpy requires a build path without symlinks to
properly build.

* Fix a broken log message when running ``pip wheel`` without a requirement.

* Don't mask network errors while downloading the file as a hash failure.

* Properly create the state file for the pip version check so it only happens
once a week.

* Fix an issue where switching between Python 3 and Python 2 would evict cached
items.

* Fix a regression where pip would be unable to successfully uninstall a
project without a normalized version.


**6.0.6 (2015-01-03)**

* Continue the regression fix from 6.0.5 which was not a complete fix.
Expand Down
Loading

0 comments on commit 108f5db

Please sign in to comment.