Skip to content

Commit 2d16354

Browse files
committed
Update documentation to use RTD theme
1 parent 4038b7a commit 2d16354

File tree

4 files changed

+52
-24
lines changed

4 files changed

+52
-24
lines changed

Diff for: conf.py

+15-12
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# serve to show the default.
1313

1414
import sys, os
15+
import sphinx_rtd_theme
1516

1617
# If extensions (or modules to document with autodoc) are in another directory,
1718
# add these directories to sys.path here. If the directory is relative to the
@@ -50,7 +51,7 @@
5051
# The short X.Y version.
5152
version = '2.0'
5253
# The full version, including alpha/beta/rc tags.
53-
release = '2.0.'
54+
release = '2.0.2'
5455

5556
# The language for content autogenerated by Sphinx. Refer to documentation
5657
# for a list of supported languages.
@@ -91,20 +92,22 @@
9192

9293
# The theme to use for HTML and HTML Help pages. See the documentation for
9394
# a list of builtin themes.
94-
html_theme = 'classic'
95-
95+
#html_theme = 'classic'
96+
RTD_NEW_THEME = True
97+
html_theme = "sphinx_rtd_theme"
98+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
9699
# Theme options are theme-specific and customize the look and feel of a theme
97100
# further. For a list of options available for each theme, see the
98101
# documentation.
99-
html_theme_options = {
100-
"sidebarbgcolor": "#006699",
101-
"sidebartextcolor": "#e7e7e7",
102-
"sidebarlinkcolor": "#e7e7e7",
103-
"relbarbgcolor": "#66aacc",
104-
"bgcolor": "#e7e7e7",
105-
"headfont": "Helvetica",
106-
"footerbgcolor": "#2f2f2f",
107-
"codebgcolor": "#c8c8c8"}
102+
#html_theme_options = {
103+
# "sidebarbgcolor": "#006699",
104+
# "sidebartextcolor": "#e7e7e7",
105+
# "sidebarlinkcolor": "#e7e7e7",
106+
# "relbarbgcolor": "#66aacc",
107+
# "bgcolor": "#e7e7e7",
108+
# "headfont": "Helvetica",
109+
# "footerbgcolor": "#2f2f2f",
110+
# "codebgcolor": "#c8c8c8"}
108111

109112
# Add any paths that contain custom themes here, relative to this directory.
110113
#html_theme_path = []

Diff for: docs/contributing.rst

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.. _contributing:
12

23
=================
34
Contributing code

Diff for: docs/install.rst

+33-11
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,24 @@ TCRM.
3030
Setting the environment
3131
-----------------------
3232

33-
To enable TCRM to run flawlessly, you may need to change some environment settings. The important variable to set is the ``PYTHONPATH`` variable. This should be set to the path where you have extracted the contents of the zip file. In the examples below, change ``/path/to/tcrm`` to the location where you extracted the TCRM files.
33+
To enable TCRM to run flawlessly, you may need to change some
34+
environment settings. The important variable to set is the
35+
``PYTHONPATH`` variable. This should be set to the path where you have
36+
extracted the contents of the zip file. In the examples below, change
37+
``/path/to/tcrm`` to the location where you extracted the TCRM files.
3438

35-
A complete discussion on environment variables in Python is given in the `Python documentation <https://docs.python.org/2/using/cmdline.html#environment-variables>`_.
39+
A complete discussion on environment variables in Python is given in
40+
the `Python documentation
41+
<https://docs.python.org/2/using/cmdline.html#environment-variables>`_.
3642

3743
Windows
3844
~~~~~~~
39-
The Python documentation contains some simple instructions for setting environment variables on Windows systems `here <https://docs.python.org/2/using/windows.html>`_. See `this link <http://www.computerhope.com/issues/ch000549.htm>`_ for setting the variables on different Windows systems.
45+
46+
The Python documentation contains some simple instructions for setting
47+
environment variables on Windows systems `here
48+
<https://docs.python.org/2/using/windows.html>`_. See `this link
49+
<http://www.computerhope.com/issues/ch000549.htm>`_ for setting the
50+
variables on different Windows systems.
4051

4152
BASH shell
4253
~~~~~~~~~~
@@ -120,7 +131,7 @@ From the base directory, execute the build process::
120131
Ubuntu
121132
~~~~~~
122133
The github branch issue_25 (created from the v2.0 branch) had an environment created by `installing miniconda
123-
<https://conda.io/docs/install/quick.html#linux-miniconda-install>`_ and executing the following commands.
134+
<https://conda.io/docs/install/quick.html#linux-miniconda-install>`_ and executing the following commands::
124135

125136
~/miniconda2/bin/conda create --name tcrm
126137
~/miniconda2/bin/source activate tcrm
@@ -136,39 +147,50 @@ The github branch issue_25 (created from the v2.0 branch) had an environment cre
136147
~/miniconda2/bin/pip --proxy=http://localhost:3128 install simplejson
137148

138149

139-
The following libraries were needed to compile the C extensions, and run the unit tests:
150+
The following libraries were needed to compile the C extensions, and run the unit tests::
151+
140152
sudo apt install libgl1-mesa-glx
141153
sudo apt-get install python-numpy-dev
142154

143-
The C extensions were compiled from the trcm directory with:
155+
The C extensions were compiled from the trcm directory with::
156+
144157
(tcrm) user@server:~/tcrm$ python intaller/setup.py build_ext -i
145158

146159
An error occurred where the include file seems to have changed paths. It may be a one off,
147160
or it may reoccur in another version of Linux. The error was in KPDF.c and the change was to
148-
comment out one line and replace it with another.
161+
comment out one line and replace it with another.::
149162

150163
#include "numpy/arrayobject.h"
151164
/* #include "arrayobject.h" */
152165

153166
A requiremements file was created in the root directory called ``linux_v20.yml`` and should (it hasn't been tested)
154-
replace the ``conda install`` commands above. The command to use this file is:
167+
replace the ``conda install`` commands above. The command to use this file is::
155168

156169
conda env create -f linux_v20.yml
157170

158-
Activating the environment would be
171+
Activating the environment would be::
172+
159173
source activate linux_v20
160174

161175

162176
Windows
163177
~~~~~~~
164178

165179
For Windows users, the code includes the ``compile.cmd`` script in the
166-
main TCRM diretory that will build these extensions in place. By default, TCRM uses the MinGW suite (http://www.mingw.org) for compiling the extensions. Other Windows-based packages can also be used (e.g. Cygwin). See the Python documentation on writing configuration files for the :mod:`distutils` package for more details.
180+
main TCRM diretory that will build these extensions in place. By
181+
default, TCRM uses the MinGW suite (http://www.mingw.org) for
182+
compiling the extensions. Other Windows-based packages can also be
183+
used (e.g. Cygwin). See the Python documentation on writing
184+
configuration files for the :mod:`distutils` package for more details.
167185

168186
Notes
169187
~~~~~
170188

171-
It is recommended to use a stand-alone Python installation for compiling and running TCRM. Installations linked to other software such as ArcGIS have resulted in compilation errors, as the required :mod:`numpy` libraries are pre-compiled and packaged with such installations.
189+
It is recommended to use a stand-alone Python installation for
190+
compiling and running TCRM. Installations linked to other software
191+
such as ArcGIS have resulted in compilation errors, as the required
192+
:mod:`numpy` libraries are pre-compiled and packaged with such
193+
installations.
172194

173195
.. _testing:
174196

Diff for: index.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ to each event. Finally an extreme value distribution is fitted to the
2323
aggregated windfields at each grid point in the model domain to
2424
provide ARI wind speed estimates.
2525

26+
TCRM can be downloaded from our GitHub repository: http://github.com/GeoscienceAustralia/tcrm
27+
2628
Features
2729
========
2830

@@ -50,7 +52,7 @@ Bleeding edge versions are accessible `here <https://github.com/GeoscienceAustra
5052

5153
Contributions are welcome -- create a `fork
5254
<https://github.com/GeoscienceAustralia/tcrm/fork>`_ or clone the
53-
repo.
55+
repo, but please read the :ref:`Contributing code<contributing>` section first.
5456

5557
Contents
5658
========

0 commit comments

Comments
 (0)