From cd376678ccdd24f6a63aa9067316e6b7c57983a2 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Tue, 30 Aug 2016 10:51:50 -0500 Subject: [PATCH 1/2] Fix ReadTheDocs build --- requirements-rtd.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-rtd.txt b/requirements-rtd.txt index bf4f197..f95ea8b 100644 --- a/requirements-rtd.txt +++ b/requirements-rtd.txt @@ -1,4 +1,5 @@ # Requirements for ReadTheDocs -# None right now, but avoid installing gnureadline, etc. # Must be set in the RTD Admin, at: # https://readthedocs.org/dashboard/django-nose/advanced/ +Django>=1.10,<1.11 +nose From 237fe8bf6f893e42f980bf8146482a65f8fd2fe6 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Tue, 30 Aug 2016 11:07:39 -0500 Subject: [PATCH 2/2] Update paths to readthedocs.io On April 27, 2016, Read The Docs moved hosted projects from readthedocs.org to readthedocs.io: https://blog.readthedocs.com/securing-subdomains/ --- README.rst | 4 ++-- docs/usage.rst | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 047ab35..1d84d37 100644 --- a/README.rst +++ b/README.rst @@ -31,7 +31,7 @@ django-nose accidentally shadowing test classes. * Taking advantage of all the useful `nose plugins`_ -.. _nose: https://nose.readthedocs.org/en/latest/ +.. _nose: https://nose.readthedocs.io/en/latest/ .. _nose plugins: http://nose-plugins.jottit.com/ It also provides: @@ -57,4 +57,4 @@ Development ----------- :Code: https://github.com/django-nose/django-nose :Issues: https://github.com/django-nose/django-nose/issues?state=open -:Docs: https://django-nose.readthedocs.org +:Docs: https://django-nose.readthedocs.io diff --git a/docs/usage.rst b/docs/usage.rst index 219d190..6e5a95e 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -7,7 +7,7 @@ test`` as usual. See ``./manage.py help test`` for all the options nose provides, and look to the `nose docs`_ for more help with nose. -.. _nose docs: https://nose.readthedocs.org +.. _nose docs: https://nose.readthedocs.io/en/latest/ Enabling Database Reuse ----------------------- @@ -185,7 +185,7 @@ setup.cfg`_ (as usual) or you can specify them in settings.py like this:: NOSE_ARGS = ['--failed', '--stop'] -.. _nose.cfg or setup.cfg: https://nose.readthedocs.org/en/latest/usage.html#configuration +.. _nose.cfg or setup.cfg: https://nose.readthedocs.io/en/latest/usage.html#configuration Custom Plugins @@ -203,5 +203,5 @@ Just like middleware or anything else, each string must be a dot-separated, importable path to an actual class. Each plugin class will be instantiated and added to the Nose test runner. -.. _make custom plugins: https://nose.readthedocs.org/en/latest/plugins.html#writing-plugins +.. _make custom plugins: https://nose.readthedocs.io/en/latest/plugins.html#writing-plugins