finish updating setup scripts

ddale · ddale · commit 23baf5de6359 · 2009-12-12T11:44:46.000-05:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include quantities/constants/NIST_codata.txt
-include quantities/tests/*.py
+include distribute_setup.py
+include CHANGES.txt
diff --git a/doc/conf.py b/doc/conf.py
@@ -48,11 +48,13 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-import quantities
+from ConfigParser import ConfigParser
+cfg = ConfigParser()
+cfg.read('../setup.cfg')
 # The short X.Y version.
-version = quantities.__version__
+version = cfg.get('metadata', 'version')
 # The full version, including alpha/beta/rc tags.
-release = quantities.__version__
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/quantities/version.py b/quantities/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.6.0'
+__version__ = '0.7.0'
diff --git a/setup.cfg b/setup.cfg
@@ -29,4 +29,9 @@ name = Quantities
 platforms = Any
 requires = numpy (>=1.3.0)
 url = http://packages.python.org/quantities
-version = 0.6.96
+version = 0.7.0
+zip_safe = False
+
+[aliases]
+release = egg_info
+source = register sdist upload --sign
diff --git a/setup.py b/setup.py
@@ -16,13 +16,10 @@
 from __future__ import with_statement
 
 from ConfigParser import ConfigParser
-import os
-import sys
 
 from distribute_setup import use_setuptools
 use_setuptools()
 from setuptools import Command, setup
-from setuptools.command.sdist import sdist as _sdist
 
 class constants(Command):
 
@@ -56,54 +53,47 @@ def run(self):
                 d = "{'value': %s, 'precision': %s, 'units': '%s'}"%(val, prec, unit)
                 f.write("physical_constants['%s'] = %s\n"%(name, d))
 
-class sdist(_sdist):
-
-    def run(self):
-        with open('quantities/version.py') as f:
-            for line in f:
-                if line.startswith('__version__'):
-                    exec(line)
-        cfg = ConfigParser()
-        cfg.read('setup.cfg')
-        if __version__ != cfg.get('metadata', 'version'):
-            with open('setup.cfg') as f:
-                lines = f.readlines()
-            with open('setup.cfg', 'w') as f:
-                for line in lines:
-                    if line.startswith('version'):
-                        line = 'version = %s\n' % __version__
-                f.write(line)
-        _sdist.run(self)
 
 cfg = ConfigParser()
 cfg.read('setup.cfg')
 
+with open('quantities/version.py') as f:
+    for line in f:
+        if line.startswith('__version__'):
+            exec(line)
+if __version__ != cfg.get('metadata', 'version'):
+    with open('setup.cfg') as f:
+        lines = f.readlines()
+    with open('setup.cfg', 'w') as f:
+        for line in lines:
+            if line.startswith('version'):
+                line = 'version = %s\n' % __version__
+            f.write(line)
+
 setup(
     author = cfg.get('metadata', 'author'),
     author_email = cfg.get('metadata', 'author_email'),
     classifiers = cfg.get('metadata', 'classifiers').split('\n'),
     cmdclass = {
         'constants' : constants,
-        'sdist' : sdist,
     },
     description = cfg.get('metadata', 'description'),
     download_url = cfg.get('metadata', 'download_url'),
     keywords = ['quantities', 'physical quantities', 'units'],
     license = 'BSD',
     long_description = cfg.get('metadata', 'long_description'),
     name = "quantities",
-    package_data = {
-        'quantities':['tests/*', 'constants/NIST_codata.txt']
-    },
     packages = [
         'quantities',
-        'quantities.units',
         'quantities.constants',
-        'quantities.umath'
+        'quantities.tests',
+        'quantities.umath',
+        'quantities.units',
     ],
     platforms = cfg.get('metadata', 'platforms'),
     requires = cfg.get('metadata', 'requires').split('\n'),
     test_suite = 'nose.collector',
     url = cfg.get('metadata', 'url'),
     version = cfg.get('metadata', 'version'),
+    zip_safe = cfg.getboolean('metadata', 'zip_safe'),
 )

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`
`2`		`-__version__ = '0.6.0'`
	`2`	`+__version__ = '0.7.0'`