Merge branch 'master' into HEAD

.cla-signers

@@ -169,3 +169,7 @@ methane | INADA Naoki <> | 2018-07-23
 ohadravid | Ohad Ravid <> | 2018-07-24
 nickpowersys | Nicholas Brown <> | 2018-09-20
 keszybz | Zbigniew Jędrzejewski-Szmek <> | 2018-09-21
+amelio-vazquez-reina | Amelio Vazquez-Reina <> | 2018-09-25
+makbigc | Mak Sze Chun <> | 2018-10-02
+mrakitin | Maksim Rakitin <> | 2018-10-19
+sdebionne | Debionne <> | 2018-11-08

conda/base/context.py

@@ -229,7 +229,7 @@ class Context(Configuration):
     anaconda_upload = PrimitiveParameter(None, aliases=('binstar_upload',),
                                          element_type=(bool, NoneType))
     _croot = PrimitiveParameter('', aliases=('croot',))
-    _conda_build = MapParameter(string_types, aliases=('conda-build',))
+    _conda_build = MapParameter(string_types, aliases=('conda-build', 'conda_build'))
 
     def __init__(self, search_path=None, argparse_args=None):
         if search_path is None:

conda/core/initialize.py

@@ -1157,7 +1157,7 @@ def init_cmd_exe_registry(target_path, conda_prefix):
     hook_path = '"%s"' % join(conda_prefix, 'condabin', 'conda_hook.bat')
     replace_str = "__CONDA_REPLACE_ME_123__"
     new_value = re.sub(
-        r'(\".*?conda[-_]hook\.bat\")',
+        r'(\"[^\"]*?conda[-_]hook\.bat\")',
         replace_str,
         prev_value,
         count=1,

conda/core/prefix_data.py

@@ -8,6 +8,7 @@
 from os import listdir
 from os.path import basename, isdir, isfile, join, lexists
 
+from .._vendor.auxlib.exceptions import ValidationError
 from ..base.constants import CONDA_TARBALL_EXTENSION, PREFIX_MAGIC_FILE
 from ..base.context import context
 from ..common.compat import JSONDecodeError, itervalues, odict, string_types, with_metaclass
@@ -257,6 +258,16 @@ def _load_site_packages(self):
                 python_record = read_python_record(self.prefix_path, af, python_pkg_record.version)
             except EnvironmentError:
                 continue
+            except ValidationError:
+                import sys
+                exc_type, exc_value, exc_traceback = sys.exc_info()
+                import traceback
+                tb = traceback.format_exception(exc_type, exc_value, exc_traceback)
+                log.warn("Problem reading non-conda package record at %s. Please verify that you "
+                         "still need this, and if so, that this is still installed correctly. "
+                         "Reinstalling this package may help.", af)
+                log.debug("ValidationError: \n%s\n", "\n".join(tb))
+                continue
             if not python_record:
                 continue
             self.__prefix_records[python_record.name] = python_record

setup.cfg

@@ -34,7 +34,7 @@ exclude = build/*,.tox/*,env/*,test_data/*,tests/*,ve/*,utils/*,*/_vendor/*,cond
 [flake8]
 max-line-length = 99
 ignore = E126,E133,E226,E241,E242,E302,E704,E731,E722,W503,E402
-exclude = build/*,.tox/*,devenv/*,env/*,test_data/*,tests/*,ve/*,utils/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
+exclude =  .asv*,build/*,.tox/*,devenv/*,env/*,test_data/*,tests/*,ve/*,utils/*,*/_vendor/*,conda/compat.py,conda/common/compat.py,conda_env/compat.py
 
 
 [coverage:report]

tests/common/pkg_formats/test_python.py

@@ -398,7 +398,7 @@ def test_metadata():
 
 # Python Distributions
 # -----------------------------------------------------------------------------
-@pytest.mark.xfail(datetime.now() < datetime(2018, 11, 1),
+@pytest.mark.xfail(datetime.now() < datetime(2018, 12, 1),
                    reason="This test needs to be refactored for the case of raising a hard "
                                 "error when the anchor_file doesn't exist.",
                    strict=True)

tests/test_resolve.py

@@ -1025,7 +1025,7 @@ def test_no_features():
     ]
 
 
-@pytest.mark.skipif(datetime.now() < datetime(2018, 11, 1), reason="bogus test; talk with @mcg1969")
+@pytest.mark.skipif(datetime.now() < datetime(2018, 12, 1), reason="bogus test; talk with @mcg1969")
 def test_multiple_solution():
     assert False
 #    index2 = index.copy()