Skip to content

Commit d968f68

Browse files
timlinuxtimlinux
committed
Better installation routine for inasafe. Docs cleanups. No more sphinx warnings.
1 parent 3e6f6dc commit d968f68

27 files changed

+517
-552
lines changed

‎CHANGES.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
v0.17.0, Jan 7 2013 -- Improved API doc generation and added a task to push
22
docs to server. Fixes for creation of template_postgis with different pg
33
versions. Added task to postgresql for building osm2pgsql. Added task to
4-
QGIS for setting up QGIS server.
4+
QGIS for setting up QGIS server. Added better task for setting up InaSAFE
5+
for development. removed line formatting under API headings. Fixes for
6+
sphinx doc warnings.
57

68
v0.16.2, Jan 3 2014 -- Another fixed bug in determining ubuntu version
79

‎LICENSE.txt

Lines changed: 503 additions & 502 deletions
Large diffs are not rendered by default.

‎docs/source/changelog.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
Changelog
33
=========
44

5-
.. include:: ../../CHANGES.txt
5+
.. literalinclude:: ../../CHANGES.txt
6+
:language: none
7+
:literal:

‎docs/source/license.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ License
33
=======
44

55
.. include:: ../../LICENSE.txt
6+
:literal:

‎fabgis/cartodb.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Cartodb related tasks
44
=====================
55
6-
----------
7-
86
Tools for deployment of cartodb on a server.
97
108
Note this is currently just a place holder. I plan to port these scripts to

‎fabgis/common.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Common helpers to bootstrap fabric.
44
===================================
55
6-
----------
7-
86
"""
97
import os
108
from fabric.api import env, task, fastprint, run, hide

‎fabgis/django.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Django related tasks.
44
=====================
55
6-
----------
76
"""
87

98
import os

‎fabgis/docker.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Docker Related Tasks.
44
=====================
55
6-
----------
7-
86
Tools for configuration and set up of docker.
97
108
.. seealso:: http://www.docker.io/

‎fabgis/dropbox.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Dropbox related tasks.
44
======================
55
6-
----------
7-
86
Helpers for dropbox so that you can easily move gis data to the server."""
97

108
import os

‎fabgis/gdal.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
GDAL Related Tasks.
44
===================
55
6-
----------
7-
86
Module for gdal related tasks"""
97
import fabtools
108
from fabric.contrib.files import exists, append

‎fabgis/git.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
Git related utilities.
33
======================
44
5-
----------
6-
75
"""
86
import os
97
from fabric.api import fastprint, run, cd, task, env

‎fabgis/hdf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Helpers for installing hdf5.
44
============================
55
6-
----------
7-
86
"""
97

108
import fabtools

‎fabgis/hetzner.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Hetzner Server related tasks.
44
=============================
55
6-
----------
7-
86
Set up a Hetzner server from scratch."""
97

108
from fabric.api import task, run, local
@@ -28,7 +26,9 @@ def hetzner_setup(host_name):
2826
Enter any text to skip it repeatedly until you get prompted for an
2927
interactive password.
3028
31-
Example session output::
29+
Example:
30+
31+
.. code-block:: none
3232
3333
out: Hetzner Online AG - installimage
3434
out:

‎fabgis/inasafe.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
Tasks for setting up InaSAFE.
44
=============================
55
6-
----------
7-
86
"""
97

108
import os
119
from fabric.api import task, fastprint, env
1210
from fabric.colors import blue, green
1311
import fabtools
1412
from .system import setup_qt4_developer_tools, setup_ccache
15-
from .common import add_ubuntugis_ppa
1613
from .git import update_git_checkout
1714
from .qgis import install_qgis2
1815

@@ -62,3 +59,5 @@ def setup_inasafe():
6259
branch='develop'
6360
)
6461
fastprint(green('Setting up InaSAFE dependencies completed.\n'))
62+
fastprint(green('You should now have checkouts of inasafe-dev, \n'))
63+
fastprint(green('inasafe_data and insafe-doc in your dev/python dir.\n'))

‎fabgis/java.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Tasks for install and setup of java.
44
====================================
55
6-
----------
7-
86
"""
97

108
from fabric.api import run, sudo, task, fastprint, env

‎fabgis/jenkins.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
Jenkins related tasks.
1010
======================
1111
12-
----------
13-
1412
"""
1513

1614
@task

‎fabgis/motion.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Motion Web Cam related tasks.
44
=============================
55
6-
----------
7-
86
This module provides tools for setting up the motion web cam daemon.
97
108
http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome

‎fabgis/postgres.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Postgres related fabric tasks.
44
==============================
55
6-
----------
7-
86
"""
97
import os
108
import fabtools
@@ -98,8 +96,9 @@ def setup_postgis_2(from_source=False):
9896
9997
:param from_source: Whether postgis should be built from source.
10098
:type from_source: bool
101-
.. versionadded:: from_source parameter added in 0.17.0
10299
100+
.. versionadded:: 0.17.0
101+
from_source parameter added
103102
"""
104103
if from_source:
105104
setup_postgis_latest()

‎fabgis/proj4.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
PROJ4 related tasks.
44
====================
55
6-
----------
7-
86
"""
97

108
import fabtools

‎fabgis/qgis.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
QGIS related build tools.
44
=========================
55
6-
----------
7-
86
"""
97
import os
108
from fabric.contrib.files import exists

‎fabgis/sphinx.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Tasks for setting up sphinx.
44
============================
55
6-
----------
7-
86
"""
97
import fabtools
108
from fabric.api import task, sudo, fastprint

‎fabgis/system.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
System related tasks.
44
=====================
55
6-
----------
7-
86
Tools for setting up and hardening a system."""
97

108
from getpass import getpass

‎fabgis/tilemill.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Tools for deployment of tilemill.
44
=================================
55
6-
----------
7-
86
.. note:: Usually you should run tilemill on your local host and prepare your
97
mbtiles, then use tilestream (https://github.com/mapbox/tilestream) to
108
host the resulting mbtiles output.

‎fabgis/tilestream.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Tools for deployment of tilestream.
44
===================================
55
6-
----------
7-
86
.. note:: Usually you should run tilemill on your local host and prepare your
97
mbtiles, then use tilestream (https://github.com/mapbox/tilestream) to
108
host the resulting mbtiles output.

‎fabgis/umn_mapserver.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Mapserver related tasks.
44
========================
55
6-
----------
7-
86
"""
97

108
import os

‎fabgis/utilities.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
General utilities.
44
==================
55
6-
----------
7-
86
"""
97
import os
108
from fabric.api import cd, sudo

‎fabgis/virtualenv.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Tools relating to the use of python virtualenv.
44
===============================================
55
6-
----------
7-
86
"""
97

108
import os

0 commit comments

Comments
 (0)