From a66371fc92c13074ebb701817d48ba7b6d2071e3 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 31 Dec 2017 13:56:23 +0100 Subject: [PATCH] Pin django version in tox docs --- docs/conf.py | 5 +++-- requirements-docs.txt | 3 +++ tox.ini | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 requirements-docs.txt diff --git a/docs/conf.py b/docs/conf.py index 7749248..e7dc979 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,8 +20,9 @@ import shlex # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. #sys.path.insert(0, os.path.abspath('.')) -sys.path.insert(0, os.path.abspath('..')) -sys.path.insert(0, os.path.abspath('../tests')) +parent = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) +sys.path.insert(0, parent) +sys.path.insert(0, os.path.join(parent, 'tests')) import cms_helper import djangocms_blog diff --git a/requirements-docs.txt b/requirements-docs.txt new file mode 100644 index 0000000..bdd9a94 --- /dev/null +++ b/requirements-docs.txt @@ -0,0 +1,3 @@ +-r requirements-test.txt +Django<2.0 +html5lib<0.99999999 diff --git a/tox.ini b/tox.ini index cf40d4b..1c092f5 100644 --- a/tox.ini +++ b/tox.ini @@ -47,9 +47,7 @@ skip_install = true deps = sphinx sphinx-rtd-theme - html5lib<0.99999999 - Django>=1.9,<1.10 - -rrequirements-test.txt + -rrequirements-docs.txt changedir=docs skip_install = true commands=