From 5034ee29d668c12f03f286b9702bf105d1211b82 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Tue, 13 Feb 2018 19:40:03 +0100
Subject: [PATCH] tweaks
---
.gitlab-ci.yml | 11 +++++------
ci/requirements.txt | 6 +++---
docs/source/code.rst | 7 -------
docs/source/concepts/domains.rst | 10 +---------
docs/source/concepts/field.rst | 8 --------
docs/source/concepts/operators.rst | 4 ----
6 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 192813598..a91b09731 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 dba7078e1..103d840b6 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 9a3f6e4e8..1cdec8c89 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 252a238ed..13b99d60b 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 7ade8e375..b9cfcb1d6 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 0f70b71e5..8938db409 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>
-
-
-
-
--
GitLab