From 9bfd45c604533c0887fdbd4bd3ef25e4e30d646b Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 5 Dec 2017 00:26:30 -0500 Subject: [PATCH 1/4] Add note about mercurial Some tests need mercurial to pass. Closes #3320 --- docs/tests.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/tests.rst b/docs/tests.rst index b817205ce24..c9067e44808 100644 --- a/docs/tests.rst +++ b/docs/tests.rst @@ -17,6 +17,8 @@ environments by running:: tox +.. note:: You need `Mercurial`_ installed to pass some tests. + To target a specific environment:: tox -e py27 @@ -35,6 +37,7 @@ target a single environment to limit the test suite:: Test documentation compilation with Sphinx. .. _`Tox`: http://tox.readthedocs.io/en/latest/index.html +.. _`Mercurial`: https://www.mercurial-scm.org/ .. _`Prospector`: http://prospector.readthedocs.io/en/master/ .. _`pylint`: http://docs.pylint.org/ .. _`pyflakes`: https://github.com/pyflakes/pyflakes From 677a4486998c60dd93e31089dfaeb481867c78de Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 5 Dec 2017 23:38:17 -0500 Subject: [PATCH 2/4] Revert "Add note about mercurial" This reverts commit 32f2c63fdb5309e2c24d3637416d405d460a35eb. --- docs/tests.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/tests.rst b/docs/tests.rst index c9067e44808..b817205ce24 100644 --- a/docs/tests.rst +++ b/docs/tests.rst @@ -17,8 +17,6 @@ environments by running:: tox -.. note:: You need `Mercurial`_ installed to pass some tests. - To target a specific environment:: tox -e py27 @@ -37,7 +35,6 @@ target a single environment to limit the test suite:: Test documentation compilation with Sphinx. .. _`Tox`: http://tox.readthedocs.io/en/latest/index.html -.. _`Mercurial`: https://www.mercurial-scm.org/ .. _`Prospector`: http://prospector.readthedocs.io/en/master/ .. _`pylint`: http://docs.pylint.org/ .. _`pyflakes`: https://github.com/pyflakes/pyflakes From 449ccfc68b19f7b8b182de1550e9e2191d1b2d38 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 5 Dec 2017 23:44:48 -0500 Subject: [PATCH 3/4] Add Mercurial to tests requirements --- requirements/testing.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/testing.txt b/requirements/testing.txt index c406f42daf2..f197ce0a760 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -5,6 +5,7 @@ pytest-django==3.1.2 pytest-xdist==1.20.1 apipkg==1.4 execnet==1.5.0 +Mercurial # local debugging tools pdbpp From eca1c5a2e071df461a220309becd614d81b07661 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Thu, 7 Dec 2017 22:27:01 -0500 Subject: [PATCH 4/4] Set Mercurial version to the latest --- requirements/testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/testing.txt b/requirements/testing.txt index f197ce0a760..e739e0d5194 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -5,7 +5,7 @@ pytest-django==3.1.2 pytest-xdist==1.20.1 apipkg==1.4 execnet==1.5.0 -Mercurial +Mercurial==4.4.2 # local debugging tools pdbpp