From 5bffa80c1c9f91de87e2a88a8a913c749849f39d Mon Sep 17 00:00:00 2001
From: Manuel Schmitzer <manuel.schmitzer@tuwien.ac.at>
Date: Mon, 30 Jul 2018 11:27:16 +0200
Subject: [PATCH] update to PyScaffold 2.5.11

---
 .gitignore            |  1 +
 docs/conf.py          |  4 ++--
 equi7grid/__init__.py |  1 +
 setup.cfg             |  3 ++-
 setup.py              |  2 +-
 tests/conftest.py     | 12 ++++++++++++
 6 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 tests/conftest.py

diff --git a/.gitignore b/.gitignore
index a61e89f..086b8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 __pycache__/*
 .cache/*
 .*.swp
+*/.ipynb_checkpoints/*
 
 # Project files
 .ropeproject
diff --git a/docs/conf.py b/docs/conf.py
index fd847dd..feac410 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,7 +45,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
               'sphinx.ext.autosummary', 'sphinx.ext.viewcode', 'sphinx.ext.coverage',
-              'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.pngmath',
+              'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
               'sphinx.ext.napoleon']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -62,7 +62,7 @@
 
 # General information about the project.
 project = u'Equi7Grid'
-copyright = u'2017, Bernhard Bauer-Marschallinger'
+copyright = u'2018, Bernhard Bauer-Marschallinger'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/equi7grid/__init__.py b/equi7grid/__init__.py
index 896994c..c280328 100644
--- a/equi7grid/__init__.py
+++ b/equi7grid/__init__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pkg_resources
 
 try:
diff --git a/setup.cfg b/setup.cfg
index 8279936..79ba8d5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,8 @@ classifier =
 
 [files]
 # Add here 'data_files', 'packages' or 'namespace_packages'.
-# Additional data files are defined as key value pairs of source and target:
+# Additional data files are defined as key value pairs of target directory
+# and source location from the root of the repository:
 packages =
     equi7grid
 # data_files =
diff --git a/setup.py b/setup.py
index 5caf316..7bcb369 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 """
     Setup file for equi7grid.
 
-    This file was generated with PyScaffold 2.5.6, a tool that easily
+    This file was generated with PyScaffold 2.5.11, a tool that easily
     puts up a scaffold for your new Python project. Learn more under:
     http://pyscaffold.readthedocs.org/
 """
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..e62e272
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Dummy conftest.py for equi7grid.
+
+    If you don't know what this is for, just leave it empty.
+    Read more about conftest.py under:
+    https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest