Merge 7dbbed8 into 44b9a38

.travis.yml

@@ -25,7 +25,6 @@ addons:
       - gdal-bin
 
 python:
-  - '2.7'
   - '3.4'
 
 virtualenv:

docs/conf.py

@@ -15,12 +15,26 @@
 import sys
 import os
 import mock
+import datetime
+
+project = 'spatialist'
+authors = 'John Truckenbrodt, Felix Cremer, Ismail Baris'
+year = datetime.datetime.now().year
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..') + os.sep)
 
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.5'
+# The full version, including alpha/beta/rc tags.
+release = '0.5'
+
 # -- General configuration ------------------------------------------------
 MOCK_MODULES = ['__future__', 'osgeo', 'osgeo.gdal', 'osgeo.osr', 'osgeo.gdalconst']  # This should be changed.
 for mod_name in MOCK_MODULES:
@@ -63,17 +77,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pyroSAR'
-copyright = u'2018, John Truckenbrodt, Felix Cremer, Ismail Baris'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.4'
-# The full version, including alpha/beta/rc tags.
-release = '0.4'
+copyright = '{}, {}'.format(year, authors)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -196,7 +200,7 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pyroSARdoc'
+htmlhelp_basename = '{}doc'.format(project)
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -215,8 +219,10 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'pyroSAR.tex', u'pyroSAR Documentation',
-     u'John Truckenbrodt, Felix Cremer, Ismail Baris', 'manual'),
+    ('index',
+     '{}.tex'.format(project),
+     '{} Documentation'.format(project),
+     authors, 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -245,8 +251,11 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'pyrosar', u'pyroSAR Documentation',
-     [u'John Truckenbrodt, Felix Cremer, Ismail Baris'], 1)
+    ('index',
+     project,
+     '{} Documentation'.format(project),
+     [authors],
+     1)
 ]
 
 # If true, show URL addresses after external links.
@@ -259,8 +268,12 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'pyroSAR', u'pyroSAR Documentation',
-     u'John Truckenbrodt, Felix Cremer, Ismail Baris', 'pyroSAR', 'One line description of project.',
+    ('index',
+     project,
+     '{} Documentation'.format(project),
+     authors,
+     project,
+     'One line description of project.',
      'Miscellaneous'),
 ]
 

pyroSAR/__init__.py

@@ -1 +1,2 @@
-from .drivers import *
+from .drivers import *
+from . import spatial