From 42cd970f19a9f853d9446f4e3db9f893f967397e Mon Sep 17 00:00:00 2001
From: dave <dave@dtu.dk>
Date: Fri, 11 Dec 2015 08:35:44 +0100
Subject: [PATCH] updated PyScaffold configuration
---
setup.cfg | 9 ++++++---
setup.py | 21 ++++++---------------
wetb/__init__.py | 6 ++++++
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index 06ea063..40b32de 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,11 +45,13 @@ packages =
# PDF =
# ReportLab>=1.2
# RXP
+#ALL =
+# django
+# cookiecutter
[test]
# py.test options when running `python setup.py test`
-addopts =
- tests
+addopts = tests
[pytest]
# Options for py.test:
@@ -68,6 +70,7 @@ docs = build_sphinx
universal = 0
[build_sphinx]
+# Options for Sphinx build
source_dir = docs
build_dir = docs/_build
@@ -85,4 +88,4 @@ autodoc_tree_index_modules = True
# Options for the devpi: PyPI serer and packaging tool
# VCS export must be deactivated since we are using setuptools-scm
no-vcs = 1
-format = bdist_wheel
+formats = bdist_wheel
diff --git a/setup.py b/setup.py
index 80db354..2e93d5c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,23 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
- Setup file for wafo.
+ Setup file for wetb.
- This file was generated with PyScaffold 2.4.2, a tool that easily
+ This file was generated with PyScaffold 2.5, a tool that easily
puts up a scaffold for your new Python project. Learn more under:
http://pyscaffold.readthedocs.org/
"""
-from __future__ import division, absolute_import, print_function
-
-# numpy.distutils will figure out if setuptools is available when imported
-# this allows us to combine setuptools use_pyscaffold=True and f2py extensions
-import setuptools
-from numpy.distutils.core import setup
-#from numpy.distutils.misc_util import Configuration
-
import sys
+from setuptools import setup
-def setup_package_pyscaffold():
-
+def setup_package():
needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
sphinx = ['sphinx'] if needs_sphinx else []
- setup(setup_requires=['six', 'pyscaffold>=2.4rc1,<2.5a0'] + sphinx,
- tests_require=['pytest_cov', 'pytest'],
+ setup(setup_requires=['six', 'pyscaffold>=2.5a0,<2.6a0'] + sphinx,
use_pyscaffold=True)
if __name__ == "__main__":
- setup_package_pyscaffold()
+ setup_package()
diff --git a/wetb/__init__.py b/wetb/__init__.py
index e69de29..896994c 100644
--- a/wetb/__init__.py
+++ b/wetb/__init__.py
@@ -0,0 +1,6 @@
+import pkg_resources
+
+try:
+ __version__ = pkg_resources.get_distribution(__name__).version
+except:
+ __version__ = 'unknown'
--
GitLab