Skip to content

Commit

Permalink
update to PyScaffold 2.5.11
Browse files Browse the repository at this point in the history
  • Loading branch information
mazweg committed Jul 30, 2018
1 parent b76b5c9 commit 5bffa80
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -10,6 +10,7 @@
__pycache__/*
.cache/*
.*.swp
*/.ipynb_checkpoints/*

# Project files
.ropeproject
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Expand Up @@ -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.
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions equi7grid/__init__.py
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
import pkg_resources

try:
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -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/
"""
Expand Down
12 changes: 12 additions & 0 deletions 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

0 comments on commit 5bffa80

Please sign in to comment.