merged from conda/master

Arrowbox · Oct 24, 2016 · 9822af1 · 9822af1
2 parents 3910739 + ac6e2d3
commit 9822af1
Show file tree

Hide file tree

Showing 106 changed files with 5,634 additions and 2,965 deletions.
diff --git a/.binstar.yml b/.binstar.yml
diff --git a/.checkignore b/.checkignore
diff --git a/.condarc b/.condarc
diff --git a/.codecov.yml → .github/codecov.yml b/.codecov.yml → .github/codecov.yml
@@ -6,4 +6,6 @@ coverage:
 ignore:
   - conda-env/.*
   - conda/_vendor/.*
+  - conda/gateways/adapters/ftp.py
+  - conda/gateways/adapters/s3.py
   - tests/.*
diff --git a/.travis.yml b/.travis.yml
@@ -35,10 +35,11 @@ matrix:
       language: python
     - os: osx
       env: PYTHON_VERSION=3.5
-    - python: '3.5'
-      env: CONDA_BUILD=2.0.1
-      os: linux
-      language: python
+      language: generic
+    # - python: '3.5'
+    #   env: CONDA_BUILD=2.0.6
+    #   os: linux
+    #   language: python
 
 install:
   - source ./utils/travis-run-install.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,94 @@
 ## 4.3.0 (unreleased)
 
+### Deprecations/Breaking Changes
+* the 'r' channel is now part of defaults (#3677)
+* remove dead install_tar function (#3641)
+
+### Improvements
+* cache VersionOrder objects to improve performance (#3596)
+* fix documentation and typos (#3526, #3572, #3627)
+* imporoved solver hint detection, simplified filtering (#3597)
+* add multikey configuration validation (#3432)
+* some Fish autocompletions (#2519)
+* fix #3667 unicode literals and unicode decode (#3682)
+
 ### Bug Fixes
 * account for the Windows Python 2.7 os.environ unicode aversion (#3363)
 * fix link field in record object (#3424)
+* anaconda api token bug fix; additional tests (#3673)
 
 ### Non-User-Facing Changes
 * remove unnecessary eval (#3428)
+* add conda.exports module (#3429)
+* apply PEP-8 to conda-env (#3653)
+* refactor dist into an object (#3616)
+* vendor appdirs; remove conda's dependency on anaconda-client import (#3675)
+* revert boto patch from #2380 (#3676)
+* move and update ROOT_NO_RM (#3697)
+* integration tests for conda clean (#3695, #3699)
+* disable coverage on s3 and ftp requests adapaters (#3696, #3701)
+
+
+## 4.2.11 (2016-10-23)
+
+### Improvements
+* only try once for windows trash removal (#3698)
+
+### Bug Fixes
+* fix anaconda api token bug (#3674)
+* fix #3646 FileMode enum comparison (#3683)
+* fix #3517 conda install --mkdir (#3684)
+* fix #3560 hack anaconda token coverup on conda info (#3686)
+* fix #3469 alias envs_path to envs_dirs (#3685)
+
+
+## 4.2.10 (2016-10-18)
+
+### Improvements
+* add json output for `conda info -s` (#3588)
+* ignore certain binary prefixes on windows (#3539)
+* allow conda config files to have .yaml extensions or 'condarc' anywhere in filename (#3633)
+
+### Bug Fixes
+* fix conda-build's handle_proxy_407 import (#3666)
+* fix #3442, #3459, #3481, #3531, #3548 multiple networking and auth issues (#3550)
+* add back linux-ppc64le subdir support (#3584)
+* fix #3600 ensure links are removed when unlinking (#3625)
+* fix #3602 search channels by platform (#3629)
+* fix duplicated packages when updating environment (#3563)
+* fix #3590 exception when parsing invalid yaml (#3593 via #3634)
+* fix #3655 a string decoding error (#3656)
+
+### Non-User-Facing Changes
+* backport conda.exports module to 4.2.x (#3654)
+* travis-ci OSX fix (#3615 via #3657)
 
 
 ## 4.1.13 (unreleased)
 
 ### Non-User-Facing Changes
 * use install.rm_rf for TemporaryDirectory cleanup (#3425)
+* fix the api->conda substitution (#3456)
+
+
+## 4.2.9 (2016-09-27)
+
+### Bug Fixes
+* fix #3536 conda-env messaging to stdout with --json flag (#3537)
+* fix #3525 writing to sys.stdout with --json flag for post-link scripts (#3538)
+* fix #3492 make NULL falsey with python 3 (#3524)
+
+
+## 4.2.8 (2016-09-26)
+
+### Improvements
+* add "error" key back to json error output (#3523)
+
+### Bug Fixes
+* fix #3453 conda fails with create_default_packages (#3454)
+* fix #3455 --dry-run fails (#3457)
+* dial down error messages for rm_rf (#3522)
+* fix #3467 AttributeError encountered for map config parameter validation (#3521)
 
 
 ## 4.2.7 (2016-09-16)

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,37 +1,27 @@
-Conda is released under the following terms:
+BSD 3-Clause License
 
-(c) 2012 Continuum Analytics, Inc. / http://continuum.io
-All Rights Reserved
+Copyright (c) 2012, Continuum Analytics, Inc.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
+
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of Continuum Analytics, Inc. nor the
-      names of its contributors may be used to endorse or promote products
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL CONTINUUM ANALYTICS BE LIABLE FOR ANY
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Dependencies
-============
-
-versioneer.py is Public Domain
-
-The ProgressBar package is redistributed under the BSD 3-clause license
-as per the terms of its license.
-(see conda/progressbar/LICENSE.txt)
-
diff --git a/README.rst b/README.rst
@@ -7,29 +7,21 @@
 
 ----------------------------------------
 
-.. image:: https://travis-ci.org/conda/conda.svg?branch=master
-   :alt: Travis-CI Build Status
-   :target: https://travis-ci.org/conda/conda
+.. image:: https://img.shields.io/travis/conda/conda/master.svg?maxAge=900&label=Linux%20%26%20MacOS
+    :target: https://travis-ci.org/conda/conda
+    :alt: Linux & MacOS tests (Travis)
 
-.. image:: https://ci.appveyor.com/api/projects/status/v6fl568drifhia2d/branch/master?svg=true
-   :alt: Appveyor Build Status
-   :target: https://ci.appveyor.com/project/ContinuumAnalyticsFOSS/conda/branch/master
+.. image:: https://img.shields.io/appveyor/ci/ContinuumAnalyticsFOSS/conda/master.svg?maxAge=900&label=Windows
+    :target: https://ci.appveyor.com/project/ContinuumAnalyticsFOSS/conda
+    :alt: Windows tests (Appveyor)
 
-.. image:: https://codecov.io/github/conda/conda/coverage.svg?branch=master
+.. image:: https://img.shields.io/codecov/c/github/conda/conda/master.svg?label=coverage
    :alt: Codecov Status
    :target: https://codecov.io/github/conda/conda?branch=master
 
-.. image:: https://scrutinizer-ci.com/g/conda/conda/badges/quality-score.png?b=master
-   :alt: Scrutinizer Code Quality
-   :target: https://scrutinizer-ci.com/g/conda/conda/?branch=master
-
-.. image:: https://www.quantifiedcode.com/api/v1/project/81377831ebe54def8b31c55a4b5b4cb0/badge.svg
-   :alt: Quantified Code
-   :target: https://www.quantifiedcode.com/app/project/81377831ebe54def8b31c55a4b5b4cb0
-
-.. image:: https://badges.gitter.im/conda/conda.svg
-   :alt: Join the chat at https://gitter.im/conda/conda
-   :target: https://gitter.im/conda/conda?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. image:: https://img.shields.io/github/release/conda/conda.svg
+   :alt: latest release version
+   :target: https://github.com/conda/conda/releases
 
 |
 

diff --git a/conda/__init__.py b/conda/__init__.py
@@ -4,7 +4,7 @@
 # conda is distributed under the terms of the BSD 3-clause license.
 # Consult LICENSE.txt or http://opensource.org/licenses/BSD-3-Clause.
 """OS-agnostic, system-level binary package manager."""
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
 import sys
@@ -50,6 +50,7 @@ def dump_map(self):
         result.update(exception_type=text_type(type(self)),
                       exception_name=self.__class__.__name__,
                       message=text_type(self),
+                      error=repr(self),
                       **self._kwargs)
         return result
 
@@ -69,4 +70,10 @@ def __str__(self):
     def dump_map(self):
         return dict(exception_type=text_type(type(self)),
                     exception_name=self.__class__.__name__,
-                    errors=tuple(error.dump_map() for error in self.errors))
+                    errors=tuple(error.dump_map() for error in self.errors),
+                    error="Multiple Errors Encountered.",
+                    )
+
+
+class CondaExitZero(CondaError):
+    pass