diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1928135988284fc643fc496b9df3b78837ffb791..a91b09731e9845ec3fa2c15eaefaa32bc3dc85d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,15 +8,14 @@ variables: DOCKER_DRIVER: overlay before_script: - - apt-get update - - sh ci/install_basics.sh - - pip install --process-dependency-links -r ci/requirements.txt - - pip3 install --process-dependency-links -r ci/requirements.txt - - python setup.py install test_min: stage: test script: + - apt-get update + - sh ci/install_basics.sh + - pip install --process-dependency-links -r ci/requirements.txt + - pip3 install --process-dependency-links -r ci/requirements.txt - pip install --user . - pip3 install --user . - nosetests -q @@ -29,7 +28,7 @@ test_min: pages: script: - - sh docs/generate.sh + - sh PYTHONPATH=. docs/generate.sh - mv docs/build/ public/ artifacts: paths: diff --git a/ci/requirements.txt b/ci/requirements.txt index dba7078e118cd4c97f9b8cae816d15f8cfd083cc..103d840b6e9ae4dd4cc765e95d1def215e25b155 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,7 +1,7 @@ parameterized coverage git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git -sphinx==1.6.7 +sphinx sphinx_rtd_theme -better-apidoc -numpydoc +#better-apidoc +#numpydoc diff --git a/docs/source/code.rst b/docs/source/code.rst index 9a3f6e4e8af9bfda52e43d75960cbcf62987cfbe..1cdec8c8910202d8ca3381ab09078af4d8f5e1b6 100644 --- a/docs/source/code.rst +++ b/docs/source/code.rst @@ -13,10 +13,3 @@ The NIFTy code is divided in the concepts Domains, Fields, Operators and Minimiz Fields <concepts/field> Operators <concepts/operators> Minimization <concepts/minimization> - - - - - - - diff --git a/docs/source/concepts/domains.rst b/docs/source/concepts/domains.rst index 252a238ed003dd4921dd54b814172440dcce7a7b..13b99d60b502ccabb302ea5b3bb42143fef85c26 100644 --- a/docs/source/concepts/domains.rst +++ b/docs/source/concepts/domains.rst @@ -15,12 +15,4 @@ Description of Domains RG <../mod/nifty4.domains.rg_space> Domain <../mod/nifty4.domains.domain> Structured Domain <../mod/nifty4.domains.structured_domain> - Unstrcutured Domain <../mod/nifty4.domains.unstructured_domain> - - - - - - - - + Unstructured Domain <../mod/nifty4.domains.unstructured_domain> diff --git a/docs/source/concepts/field.rst b/docs/source/concepts/field.rst index 7ade8e375e513e19c946f58366482600b8484ef2..b9cfcb1d600f49c5f59e7d9b76e1cdc4f2635960 100644 --- a/docs/source/concepts/field.rst +++ b/docs/source/concepts/field.rst @@ -8,11 +8,3 @@ Description of Fields :caption: Types of Fields Field <../mod/nifty4.field> - - - - - - - - diff --git a/docs/source/concepts/operators.rst b/docs/source/concepts/operators.rst index 0f70b71e55761b2b1e223324128fa8df0c55c0f1..8938db409cbee4c6629ca113b220bbc61c8c8bf1 100644 --- a/docs/source/concepts/operators.rst +++ b/docs/source/concepts/operators.rst @@ -24,7 +24,3 @@ Description of Operators Scaling <../mod/nifty4.operators.smoothness_operator> Smoothness <../mod/nifty4.operators.smoothness_operator> Sum <../mod/nifty4.operators.sum_operator> - - - -