Merge branch 'master' into jl/fix-identical-solve

CHANGELOG.md

@@ -1,3 +1,96 @@
+## 4.8.0rc0 (2019-11-04)
+
+### Enhancements:
+
+* retry downloads if they fail, controlled by `remote_max_retries` and `remote_backoff_factor` configuration values (#9318)
+* redact authentication information in some URLs (#9341)
+* add osx version virtual package , `__osx` (#9349)
+* add glibc virtual package, `__glibc` (#9358)
+
+### Docs
+
+* removeed references to MD5s from docs (#9247)
+* Add docs on `CONDA_DLL_SEARCH_MODIFICATION_ENABLED` (#9286)
+* document threads, spec history and configuration (#9327)
+* more documentation on channels (#9335)
+* document the .condarc search order (#9369)
+* various minor documentation fixes (#9238, #9248, #9267, #9334, #9351, #9372, #9378, #9388, #9391, #9393)
+
+### Bug fixes
+
+* fix issues with xonsh activation on Windows (#8246)
+* remove unsupported --lock argument from conda clean (#8310)
+* do not add `sys_prefix_path` to failed activation or deactivation (#9282)
+* fix csh setenv command (#9284)
+* do not memorize `PackageRecord.combined_depends` (#9289)
+* use `CONDA_INTERNAL_OLDPATH` rather than `OLDPATH` in activation script (#9303)
+* fixes xonsh activation and tab completion (#9305)
+* fix what channels are queried when context.offline is True (#9385)
+
+
+### Contributors
+
+* @analog-cbarber
+* @andreasg123
+* @beckermr
+* @bryant1410
+* @colinbrislawn
+* @felker
+* @forrestwaters
+* @gabrielcnr
+* @isuruf
+* @jakirkham
+* @jeremyjliu
+* @jjhelmus
+* @jooh
+* @jpigla
+* @marcelotrevisani
+* @melund
+* @mfansler
+* @mingwandroid
+* @msarahan
+* @rrigdon
+* @scopatz
+* @soapy1
+* @WillyChen123
+* @xhochy
+
+
+## 4.7.12 (2019-09-12)
+
+### Enhancements:
+
+* add support for env file creation based on explicit specs in history (#9093)
+* detect prefix paths when -p nor -n not given  (#9135)
+* Add config parameter to disable conflict finding (for faster time to errors)  (#9190)
+
+### Bug fixes
+
+* fix race condition with creation of repodata cache dir  (#9073)
+* fix ProxyError expected arguments  (#9123)
+* makedirs to initialize .conda folder when registering env - fixes permission errors with .conda folders not existing when package cache gets created (#9215)
+* fix list duplicates errors in reading repodata/prefix data  (#9132)
+* fix neutered specs not being recorded in history, leading to unsatisfiable environments later  (#9147)
+* Standardize "conda env list" behavior between platforms  (#9166)
+* add JSON output to conda env create/update  (#9204)
+* speed up finding conflicting specs (speed regression in 4.7.11)  (#9218)
+
+### Contributors
+
+* @beenje
+* @Bezier89
+* @cjmartian
+* @forrestwaters
+* @jjhelmus
+* @martin-raden
+* @msarahan
+* @nganani
+* @rrigdon
+* @soapy1
+* @WesRoach
+* @zheaton
+
+
 ## 4.7.11 (2019-08-06)
 
 ### Enhancements
@@ -501,20 +594,20 @@
 ### Bug fixes
 
 * detect when parser fails to parse arguments  (#8328)
-* separate post-link script running from package linking.  Do linking of all packages first, then run any post-link 
+* separate post-link script running from package linking.  Do linking of all packages first, then run any post-link
   scripts after all packages are present.  Ideally, more forgiving in presence of cycles.  (#8350)
 * quote path to temporary requirements files generated by conda env.  Fixes issues with spaces.  (#8352)
 * improve some exception handling around checking for presence of folders in extraction of tarballs  (#8360)
 * fix reporting of packages when channel name is None  (#8379)
 * fix the post-creation helper message from "source activate" to "conda activate"  (#8370)
-* Add safety checks for directory traversal exploits in tarfiles.  These may be disabled using the ``safety_checks`` 
+* Add safety checks for directory traversal exploits in tarfiles.  These may be disabled using the ``safety_checks``
   configuration parameter.  (#8374)
 
 ### Docs improvements
 
 * document MKL DLL hell and new Python env vars to control DLL search behavior  (#8315)
 * add github template for reporting speed issues  (#8344)
-* add in better use of sphinx admonitions (notes, warnings) for better accentuation in docs  (#8348) 
+* add in better use of sphinx admonitions (notes, warnings) for better accentuation in docs  (#8348)
 * improve skipping CI builds when only docs changes are involved  (#8336)
 
 ### Contributors