[python-dtcwt] 55/497: make sphinx use setup.cfg to get version info

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit 9dcd314bc15df9f933737da1dcabd29fac785aac
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Thu Aug 8 00:24:11 2013 +0100

    make sphinx use setup.cfg to get version info
---
 docs/conf.py |  6 ++++++
 setup.cfg    |  5 +++++
 setup.py     | 13 -------------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6cee3ec..e3c898a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,6 +13,12 @@
 
 import sys, os
 
+from six.moves import configparser
+
+# Load this project's setup.cfg
+setup_cfg = configparser.ConfigParser()
+setup_cfg.read(os.path.join(os.path.dirname(__file__), '..', 'setup.cfg'))
+
 # 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.
diff --git a/setup.cfg b/setup.cfg
index a9217f6..5403afb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,8 @@
+[metadata]
+name = dtcwt
+# IMPORTANT: before release, remove the 'devN' tag from the release name
+version = 0.3dev1
+
 [build_sphinx]
 source-dir = docs/
 build-dir  = build/docs
diff --git a/setup.py b/setup.py
index e6352f9..1117ef2 100644
--- a/setup.py
+++ b/setup.py
@@ -8,13 +8,7 @@ from setuptools import setup, find_packages
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
-# IMPORTANT: before release, remove the 'devN' tag from the release name
-version = '0.3'
-release = '0.3.0.dev1'
-
 setup(
-    name = 'dtcwt',
-    version = release,
     author = "Rich Wareham",
     author_email = "rich.dtcwt at richwareham.com",
     description = ("A port of the Dual-Tree Complex Wavelet Transform MATLAB toolbox."),
@@ -42,13 +36,6 @@ setup(
     },
 
     tests_require=[ 'coverage', ],
-
-    command_options = {
-        'build_sphinx': {
-            'version': ( 'setup.py', version ),
-            'release': ( 'setup.py', release ),
-        },
-    },
 )
 
 # vim:sw=4:sts=4:et

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git