From b3c4f6586a7d1da02fc6e219ddb6be4e2f5d923b Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 8 Sep 2017 00:40:56 -0400 Subject: [PATCH 1/2] Update changelog for next release --- docs/changelog.rst | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 58c16c2c..961c1f51 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,11 +2,44 @@ Doctr Changelog ================= -Current -======= -- Invalid input won't kill ``doctr`` but will instead prompt again for valid +1.6.0 (2017-09-??) +================== + +Major Changes +------------- + +- Fix pushing to .github.io repos (thanks @danielballan). (:issue:`190`) +- Run ``--command`` on the original branch, not the deploy branch. + (:issue:`192`) +- Run ``--command`` with ``shell=True``. (:issue:`193`) +- Fix ``doctr configure`` for 2-factor authentication from SMS (thanks + @techgaun). (:issue:`203`) +- Copy ``--built-docs`` to a temporary directory before syncing. Fixes syncing + of committed files. (:issue:`215`) +- Only set the git username and password on Travis if they aren't set already. + (:issue:`216`) +- Guess the repo automatically in ``doctr configure``. (:issue:`217`) +- Use ``git stash`` instead of ``git reset --hard`` on Travis. Fixes syncing + tracked files with changes. (:issue:`219`) +- Automatically retry on failure in Travis. Fixes race conditions from pushing + from concurrent builds. (:issue:`222`) +- Use the "ours" merge strategy on merge. This should avoid issues when there + are merge conflicts on gh-pages from other non-doctr commits. (:issue:`232`) +- Allow ``--built-docs`` to be a file. (:issue:`252`) + +Minor Changes +------------- + +- Improve instructions (thanks @choldgraf). (:issue:`186`) +- Skip GitHub tests if no API token is present (:issue:`187`) +- Invalid input won't kill ``doctr configure`` but will instead prompt again for valid input. Prevents users from having to go through the whole login rigamarole - again. (:issue:`181`) + again. (:issue:`181`, :issue:`188`) +- Make it clearer in the docs that doctr isn't just for Sphinx. (:issue:`196`) +- Print a red error message when doctr fails. (:issue:`239`) +- Fix some rendering in the docs (thanks @CJ-Wright). (:issue:`249`) +- Fix out of order command output (except when doctr uses a token). Also, + print doctr commands in blue. (:issue:`250`) 1.5.3 (2017-04-07) ================== From ab2d38b836225dbe716e2ce3c65aa7fb24583390 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Tue, 26 Sep 2017 17:44:05 -0400 Subject: [PATCH 2/2] Set the release date for 1.6 to today --- docs/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 961c1f51..6c5b4fa5 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,7 +2,7 @@ Doctr Changelog ================= -1.6.0 (2017-09-??) +1.6.0 (2017-09-26) ================== Major Changes