Merge remote-tracking branch 'origin/4.4.x'

.travis.yml

@@ -34,14 +34,14 @@ matrix:
       os: linux
       language: python
     - os: osx
-      env: PYTHON_VERSION=3.5
+      env: PYTHON_VERSION=3.6
       language: generic
     - python: '3.5'
-      env: CONDA_BUILD=2.0.12
+      env: CONDA_BUILD=2.1.2
       os: linux
       language: python
     - python: '3.5'
-      env: CONDA_BUILD=2.1.1
+      env: CONDA_BUILD=master
       os: linux
       language: python
 

CHANGELOG.md

@@ -1,7 +1,42 @@
 ## 4.4.0 (unreleased)
 
 ### New Features
-* general support for all bourne- and c-based shells #3175
+* general support for all bourne- and c-based shells (#3175)
+
+### Non-User-Facing Changes
+* eliminate index modification in Resolve.__init__ (#4333)
+
+
+## 4.3.9 (2017-01-31)
+
+### Improvements
+* improve repodata caching for performance (#4478, #4488)
+* expand scope of packages included by bad_installed (#4402)
+* silence pre-link warning for old noarch (#4451)
+* add configuration to optionally require noarch repodata (#4450)
+* improve conda subprocessing (#4447)
+* respect info/link.json (#4482)
+
+### Bug Fixes
+* fix #4398 'hard' was used for link type at one point (#4409)
+* fixed "No matches for wildcard '$activate_d/*.fish'" warning (#4415)
+* print correct activate/deactivate message for fish shell (#4423)
+* fix 'Dist' object has no attribute 'fn' (#4424)
+* fix noarch generic and add additional integration test (#4431)
+* fix #4425 unknown encoding (#4433)
+
+### Non-User-Facing Changes
+* fail CI on conda-build fail (#4405)
+* run doctests (#4414)
+* make index record mutable again (#4461)
+* additional test for conda list --json (#4480)
+
+
+## 4.3.8 (2017-01-23)
+
+### Bug Fixes
+* fix #4309 ignore EXDEV error for directory renames (#4392)
+* fix #4393 by force-renaming certain backup files if the path already exists (#4397)
 
 
 ## 4.3.7 (2017-01-20)
@@ -255,6 +290,15 @@
 * context-dependent setup.py files (#4057)
 
 
+## 4.2.17 (unreleased)
+
+## Improvements
+* silence pre-link warning for old noarch 4.2.x backport (#4453)
+
+### Non-User-Facing Changes
+* build 4.2.x against conda-build 2.1.2 and enforce passing (#4462)
+
+
 ## 4.2.16 (2017-01-20)
 
 ### Improvements

conda/base/context.py

@@ -98,6 +98,7 @@ class Context(Configuration):
     _channel_alias = PrimitiveParameter(DEFAULT_CHANNEL_ALIAS,
                                         aliases=('channel_alias',),
                                         validation=channel_alias_validation)
+    allow_non_channel_urls = PrimitiveParameter(True)
 
     # channels
     _channels = SequenceParameter(string_types, default=(DEFAULTS_CHANNEL_NAME,),

conda/cli/install.py

@@ -91,15 +91,27 @@ def print_activate(arg):
         #
         """)
     else:
-        message = dals("""
-        #
-        # To activate this environment, use:
-        # > source activate %s
-        #
-        # To deactivate this environment, use:
-        # > source deactivate %s
-        #
-        """)
+        shell = os.path.split(os.environ.get('SHELL', ''))[-1]
+        if 'fish' == shell:
+            message = dals("""
+            #
+            # To activate this environment, use:
+            # > conda activate %s
+            #
+            # To deactivate this environment, use:
+            # > conda deactivate %s
+            #
+            """)
+        else:
+            message = dals("""
+            #
+            # To activate this environment, use:
+            # > source activate %s
+            #
+            # To deactivate this environment, use:
+            # > source deactivate %s
+            #
+            """)
 
     return message % (arg, arg)