diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abf3e95fc21de3a6bb73a23c831e547f16c8d19f..b6bb1570994315db6e0ec7a3ec8995d14df44877 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,12 @@ -image: alpine +image: centos pages: script: - - apk --no-cache add py2-pip python-dev build-base jpeg-dev zlib-dev + - yum install -y wget zlib-devel make + - wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + - rpm -ivh epel-release-latest-7.noarch.rpm + - yum install -y python-pip python-setuptools python34-numpy numpy - pip install sphinx sphinxcontrib-blockdiag blockdiag sphinxcontrib-restbuilder - - apk --no-cache add make - make html artifacts: paths: diff --git a/doc/conf.py b/doc/conf.py index a73c8e9cfb4f31db72ff195ee0b9725a45b60efa..d7b5578169b2fd5832812948d152074d25fd389c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -164,7 +164,7 @@ html_theme = 'sphinxdoc' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +#html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/doc/index.rst b/doc/index.rst index 493a4bf8efc1e1097e8c99a29dd26d0500d09e0f..031b36ad3f455e841013f37461762dd5ecb2d0f7 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -11,9 +11,8 @@ Contents: .. toctree:: :maxdepth: 2 - other - ess/index - scripts/index + ess/index + scripts/index Indices and tables ================== diff --git a/doc/other.rst b/doc/other.rst deleted file mode 100644 index d95b4ce66989e349d82d20e48091ef5528609b2f..0000000000000000000000000000000000000000 --- a/doc/other.rst +++ /dev/null @@ -1,2 +0,0 @@ -Test Doc ---------