Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e19ba78
Add basic functionality for joined RTD-docu
bjoernbroetz Jun 13, 2019
fa81860
Adjust links
bjoernbroetz Jun 14, 2019
da843c2
Make year in copyright notice current
bjoernbroetz Jun 14, 2019
b48415a
Adjust sidebar
bjoernbroetz Jun 14, 2019
3f0cc57
Remove not needed code from sphinx config
bjoernbroetz Jun 14, 2019
51c9f27
Cleanup
bjoernbroetz Jun 14, 2019
355e47c
Enhance style
bjoernbroetz Jun 14, 2019
41c4cb5
Enhance style
bjoernbroetz Jun 14, 2019
fd6f0f3
Remove fixed RTD state
bjoernbroetz Jun 19, 2019
b05a164
Update dependencies
bouweandela Jun 19, 2019
12f57e9
Fix error in rootpath
bouweandela Jun 19, 2019
47d0d74
Merge branch 'docu_join' of github.com:ESMValGroup/ESMValCore into do…
bjoernbroetz Jun 19, 2019
92a16d2
Set default branch to `docu_join` for RTD integration
bjoernbroetz Jun 19, 2019
b42ccdf
Update conf.py
bjoernbroetz Jun 24, 2019
77a069c
Merge branch 'development' into docu_join
JaroCamphuijsen Jun 25, 2019
edca8d9
Move documentation up in folder structure
JaroCamphuijsen Jun 25, 2019
e7a8702
fix links after folder restructuring
JaroCamphuijsen Jun 25, 2019
7ef2958
generate headers in sidebar
JaroCamphuijsen Jun 25, 2019
7ee981b
fix some flake8 errors
JaroCamphuijsen Jun 26, 2019
657deff
revert sidebar headers, adjust codacy ignore
JaroCamphuijsen Jun 26, 2019
1a4c953
sync preprocessor doc to esmvaltool repo
JaroCamphuijsen Jun 26, 2019
c2737d8
update datafinder.inc and recipe.inc from esmvaltool repo
JaroCamphuijsen Jun 26, 2019
a565210
add intersphinx mapping to fix broken links
JaroCamphuijsen Jun 26, 2019
0085443
fix import and remove esmvaltool doc files
JaroCamphuijsen Jun 26, 2019
f0212ad
Remove some whitespace to test rtd webhook
bouweandela Jun 26, 2019
2266e44
Test webhook
bouweandela Jun 27, 2019
70bfda7
Remove non-core documentation
bouweandela Jun 27, 2019
9f053c6
Move api documentation
bouweandela Jun 27, 2019
208c647
Add logo again
bouweandela Jun 28, 2019
abf93cb
Move build dir to doc/build
bouweandela Jun 28, 2019
6013b34
Fix local build
bouweandela Jun 28, 2019
5fbe4fb
Move from include to normal rst files
bouweandela Jun 28, 2019
e583741
Remove comment
bouweandela Jun 28, 2019
dd21631
Add documentation build test
bouweandela Jun 28, 2019
a7e8eae
try fixing psutils dependency fail
JaroCamphuijsen Jul 1, 2019
04cd1fe
Shorter names and set maxdepth 1
bouweandela Jul 1, 2019
825b9d4
Replace docu_join by latest
bouweandela Jul 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,36 @@ jobs:
pip install codacy-coverage
python-codacy-coverage -r test-reports/coverage.xml

develop:
# Test development installation
working_directory: /develop
documentation:
# Test building documentation
working_directory: /doc
docker:
- image: continuumio/miniconda3
steps:
- checkout
- restore_cache:
key: documentation-{{ .Branch }}
- run:
command: |
. /opt/conda/etc/profile.d/conda.sh
set -x
mkdir /logs
# Install
conda update -y conda > /logs/conda.txt 2>&1
conda env update >> /logs/conda.txt 2>&1
set +x; conda activate esmvaltool; set -x
pip install -e .[develop] > /logs/install.txt 2>&1
pip install -r doc/requirements.txt > /logs/install.txt 2>&1
pip install sphinx sphinx_rtd_theme >> /logs/install.txt 2>&1
# Log versions
dpkg -l > /logs/versions.txt
conda env export > /logs/environment.yml
pip freeze > /logs/requirements.txt
# Test installation
esmvaltool -h
python setup.py test --addopts --installation
# Test building documentation
MPLBACKEND=Agg python setup.py build_sphinx --warning-is-error
- save_cache:
key: documentation-{{ .Branch }}
paths:
- ".eggs"
- store_artifacts:
path: /logs

doc:
# Test building documentation
working_directory: /doc
develop:
# Test development installation
working_directory: /develop
docker:
- image: continuumio/miniconda3
steps:
Expand All @@ -125,8 +125,9 @@ jobs:
dpkg -l > /logs/versions.txt
conda env export > /logs/environment.yml
pip freeze > /logs/requirements.txt
# Test building documentation
python setup.py build_sphinx
# Test installation
esmvaltool -h
python setup.py test --addopts --installation
- store_artifacts:
path: /logs

Expand Down Expand Up @@ -190,6 +191,7 @@ workflows:
jobs:
- test
- install
- documentation
nightly:
triggers:
- schedule:
Expand All @@ -202,7 +204,7 @@ workflows:
jobs:
- test
- install
- documentation
- develop
- doc
- conda_build
- conda_install
2 changes: 1 addition & 1 deletion .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ engines:
python_version: 3

exclude_paths: [
'doc/sphinx/**',
'doc/conf.py',
'esmvaltool/cmor/tables/**',
'tests/**'
]
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ test-reports/
/python_test_out.txt

# Build folder
doc/sphinx/source/diag_scripts/**
doc/sphinx/source/plot_scripts/**
doc/sphinx/build
doc/build
doc/_sidebar.rst.inc

# Data files
*.nc
Expand Down
10 changes: 10 additions & 0 deletions doc/api/esmvalcore.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ESMValTool Core API Reference
=============================

ESMValTool Core is mostly used as a commandline tool. However, it is also possibly to use (parts of) ESMValTool as a
library. This section documents the public API of ESMValTool Core.

.. toctree::

esmvalcore.cmor
esmvalcore.preprocessor
Loading