Repository: conda/conda

Issue:
Remove pkgs/pro from defaults in conda 4.6
For the release for conda 4.6.0, remove `https://repo.anaconda.com/pkgs/pro` from the default value for `defaults`.


Discussion:

Resolving patch:
diff --git a/conda/base/constants.py b/conda/base/constants.py
--- a/conda/base/constants.py
+++ b/conda/base/constants.py
@@ -67,17 +67,19 @@
     'https://repo.anaconda.com/pkgs/main',
     'https://repo.anaconda.com/pkgs/free',
     'https://repo.anaconda.com/pkgs/r',
-    'https://repo.anaconda.com/pkgs/pro',
 )
 
 DEFAULT_CHANNELS_WIN = (
     'https://repo.anaconda.com/pkgs/main',
     'https://repo.anaconda.com/pkgs/free',
     'https://repo.anaconda.com/pkgs/r',
-    'https://repo.anaconda.com/pkgs/pro',
     'https://repo.anaconda.com/pkgs/msys2',
 )
 
+DEFAULT_CUSTOM_CHANNELS = {
+    'pkgs/pro': 'https://repo.anaconda.com',
+}
+
 # use the bool(sys.platform == "win32") definition here so we don't import .compat.on_win
 DEFAULT_CHANNELS = DEFAULT_CHANNELS_WIN if bool(sys.platform == "win32") else DEFAULT_CHANNELS_UNIX
 
diff --git a/conda/base/context.py b/conda/base/context.py
--- a/conda/base/context.py
+++ b/conda/base/context.py
@@ -10,9 +10,9 @@
 import sys
 
 from .constants import (APP_NAME, DEFAULTS_CHANNEL_NAME, DEFAULT_AGGRESSIVE_UPDATE_PACKAGES,
-                        DEFAULT_CHANNELS, DEFAULT_CHANNEL_ALIAS, ERROR_UPLOAD_URL,
-                        PLATFORM_DIRECTORIES, PREFIX_MAGIC_FILE, PathConflict, ROOT_ENV_NAME,
-                        SEARCH_PATH, SafetyChecks)
+                        DEFAULT_CHANNELS, DEFAULT_CHANNEL_ALIAS, DEFAULT_CUSTOM_CHANNELS,
+                        ERROR_UPLOAD_URL, PLATFORM_DIRECTORIES, PREFIX_MAGIC_FILE, PathConflict,
+                        ROOT_ENV_NAME, SEARCH_PATH, SafetyChecks)
 from .. import __version__ as CONDA_VERSION
 from .._vendor.appdirs import user_data_dir
 from .._vendor.auxlib.collection import frozendict
@@ -173,7 +173,8 @@ class Context(Configuration):
     channel_priority = PrimitiveParameter(True)
     _channels = SequenceParameter(string_types, default=(DEFAULTS_CHANNEL_NAME,),
                                   aliases=('channels', 'channel',))  # channel for args.channel
-    _custom_channels = MapParameter(string_types, aliases=('custom_channels',))
+    _custom_channels = MapParameter(string_types, DEFAULT_CUSTOM_CHANNELS,
+                                    aliases=('custom_channels',))
     _custom_multichannels = MapParameter(list, aliases=('custom_multichannels',))
     _default_channels = SequenceParameter(string_types, DEFAULT_CHANNELS,
                                           aliases=('default_channels',))


Test patch:
diff --git a/tests/models/test_channel.py b/tests/models/test_channel.py
--- a/tests/models/test_channel.py
+++ b/tests/models/test_channel.py
@@ -39,8 +39,7 @@ def setUpClass(cls):
                             'https://repo.anaconda.com/pkgs/free/noarch',
                             'https://repo.anaconda.com/pkgs/r/%s' % cls.platform,
                             'https://repo.anaconda.com/pkgs/r/noarch',
-                            'https://repo.anaconda.com/pkgs/pro/%s' % cls.platform,
-                            'https://repo.anaconda.com/pkgs/pro/noarch']
+                            ]
         if on_win:
             cls.DEFAULT_URLS.extend(['https://repo.anaconda.com/pkgs/msys2/%s' % cls.platform,
                                      'https://repo.anaconda.com/pkgs/msys2/noarch'])
@@ -1000,15 +999,12 @@ def test_multichannel_priority():
             ('https://repo.anaconda.com/pkgs/r/new-optimized-subdir', ('defaults', 3)),
             ('https://repo.anaconda.com/pkgs/r/linux-32', ('defaults', 3)),
             ('https://repo.anaconda.com/pkgs/r/noarch', ('defaults', 3)),
-            ('https://repo.anaconda.com/pkgs/pro/new-optimized-subdir', ('defaults', 4)),
-            ('https://repo.anaconda.com/pkgs/pro/linux-32', ('defaults', 4)),
-            ('https://repo.anaconda.com/pkgs/pro/noarch', ('defaults', 4)),
-            ('https://repo.anaconda.com/pkgs/msys2/new-optimized-subdir', ('defaults', 5)),
-            ('https://repo.anaconda.com/pkgs/msys2/linux-32', ('defaults', 5)),
-            ('https://repo.anaconda.com/pkgs/msys2/noarch', ('defaults', 5)),
-            ('https://conda.anaconda.org/conda-forge/new-optimized-subdir', ('conda-forge', 6)),
-            ('https://conda.anaconda.org/conda-forge/linux-32', ('conda-forge', 6)),
-            ('https://conda.anaconda.org/conda-forge/noarch', ('conda-forge', 6)),
+            ('https://repo.anaconda.com/pkgs/msys2/new-optimized-subdir', ('defaults', 4)),
+            ('https://repo.anaconda.com/pkgs/msys2/linux-32', ('defaults', 4)),
+            ('https://repo.anaconda.com/pkgs/msys2/noarch', ('defaults', 4)),
+            ('https://conda.anaconda.org/conda-forge/new-optimized-subdir', ('conda-forge', 5)),
+            ('https://conda.anaconda.org/conda-forge/linux-32', ('conda-forge', 5)),
+            ('https://conda.anaconda.org/conda-forge/noarch', ('conda-forge', 5)),
         ])
     else:
         assert channel_priority_map == OrderedDict([
@@ -1024,10 +1020,7 @@ def test_multichannel_priority():
             ('https://repo.anaconda.com/pkgs/r/new-optimized-subdir', ('defaults', 3)),
             ('https://repo.anaconda.com/pkgs/r/linux-32', ('defaults', 3)),
             ('https://repo.anaconda.com/pkgs/r/noarch', ('defaults', 3)),
-            ('https://repo.anaconda.com/pkgs/pro/new-optimized-subdir', ('defaults', 4)),
-            ('https://repo.anaconda.com/pkgs/pro/linux-32', ('defaults', 4)),
-            ('https://repo.anaconda.com/pkgs/pro/noarch', ('defaults', 4)),
-            ('https://conda.anaconda.org/conda-forge/new-optimized-subdir', ('conda-forge', 5)),
-            ('https://conda.anaconda.org/conda-forge/linux-32', ('conda-forge', 5)),
-            ('https://conda.anaconda.org/conda-forge/noarch', ('conda-forge', 5)),
+            ('https://conda.anaconda.org/conda-forge/new-optimized-subdir', ('conda-forge', 4)),
+            ('https://conda.anaconda.org/conda-forge/linux-32', ('conda-forge', 4)),
+            ('https://conda.anaconda.org/conda-forge/noarch', ('conda-forge', 4)),
         ])