uses versioneer

ddale · ddale · commit a95cda61f77d · 2015-12-16T10:07:06.000-05:00
diff --git a/conda.recipe/bld.bat b/conda.recipe/bld.bat
@@ -1,2 +1,5 @@
+git describe --tags --dirty > %SRC_DIR%/__conda_version__.txt
+%PYTHON% %RECIPE_DIR%/format_version.py %SRC_DIR%/__conda_version__.txt
+
 %PYTHON% setup.py install
 if errorlevel 1 exit 1
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
@@ -1 +1,4 @@
-$PYTHON setup.py install
+git describe --tags --dirty > $SRC_DIR/__conda_version__.txt
+$PYTHON $RECIPE_DIR/format_version.py $SRC_DIR/__conda_version__.txt
+
+$PYTHON setup.py install
diff --git a/conda.recipe/format_version.py b/conda.recipe/format_version.py
@@ -0,0 +1,8 @@
+import os
+import sys
+
+fn = sys.argv[1]
+with open(fn) as f:
+    s = f.read().lstrip('v').replace('-', '+', 1).replace('-', '.')
+with open(fn, 'w') as f:
+    f.write(s)
diff --git a/doc/conf.py b/doc/conf.py
@@ -48,14 +48,11 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-with open('../quantities/version.py') as f:
-    for line in f:
-        if line.startswith('__version__'):
-            exec(line)
+from quantities import __version__
 # The short X.Y version.
 version = __version__
 # The full version, including alpha/beta/rc tags.
-release = version
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/rtd-requirements.txt b/doc/rtd-requirements.txt
@@ -0,0 +1 @@
+numpydoc
diff --git a/quantities/__init__.py b/quantities/__init__.py
@@ -213,7 +213,7 @@
    >>> print pq.constants.proton_mass.simplified
    1.672621637e-27 kg
    +/-8.3e-35 kg (1 sigma)
-   
+
 A Latex representation of the dimensionality may be obtained in the following fashion::
 
     >>> g = pq.Quantity(9.80665,'m/s**2')
@@ -225,12 +225,12 @@
     >>> print weight.dimensionality.latex
     $\\mathrm{N}$
 
-The Latex output is compliant with the MathText subset used by Matplotlib.  To add 
+The Latex output is compliant with the MathText subset used by Matplotlib.  To add
 formatted units to the axis label of a Matplotlib figure, one could use::
 
     >>> ax.set_ylabel('Weight ' + weight.dimensionality.latex)
-    
-Greater customization is available via the markup.format_units_latex function.  It allows 
+
+Greater customization is available via the markup.format_units_latex function.  It allows
 the user to modify the font, the multiplication symbol, or to encapsulate the latex
 string in parentheses.  Due to the complexity of CompoundUnits, the latex rendering
 of CompoundUnits will utilize the latex \\frac{num}{den} construct.
@@ -267,7 +267,9 @@
 
 from __future__ import absolute_import
 
-from .version import __version__
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
 
 from .registry import unit_registry
 
@@ -290,4 +292,3 @@ def test(verbosity=1):
     import unittest
     suite = unittest.TestLoader().discover('quantities')
     unittest.TextTestRunner(verbosity=verbosity).run(suite)
-
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,7 @@
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = hexedd/_version.py
+versionfile_build = hexedd/_version.py
+tag_prefix = v
+parentdir_prefix = hexedd-
diff --git a/setup.py b/setup.py
@@ -4,6 +4,11 @@
 from distutils.command.build import build as _build
 import os
 
+import versioneer
+
+
+cmdclass = versioneer.get_cmdclass()
+
 
 class data(Command):
 
@@ -38,20 +43,26 @@ def run(self):
                     %(val, prec, unit)
                 f.write("physical_constants['%s'] = %s\n"%(name, d))
 
+cmdclass['data'] = data
+
 
 class sdist(_sdist):
 
     def run(self):
         self.run_command('data')
         _sdist.run(self)
 
+cmdclass['sdist'] = sdist
+
 
 class build(_build):
 
     def run(self):
         self.run_command('data')
         _build.run(self)
 
+cmdclass['build'] = build
+
 
 class test(Command):
 
@@ -79,6 +90,8 @@ def run(self):
         suite = unittest.TestLoader().discover('.')
         unittest.TextTestRunner(verbosity=self.verbosity+1).run(suite)
 
+cmdclass['test'] = test
+
 
 packages = []
 for dirpath, dirnames, filenames in os.walk('quantities'):
@@ -107,12 +120,7 @@ def run(self):
 #        Topic :: Education
 #        Topic :: Scientific/Engineering
 #        """,
-    cmdclass = {
-        'build': build,
-        'data': data,
-        'sdist': sdist,
-        'test': test,
-        },
+    cmdclass = cmdclass,
     description = "Support for physical quantities with units, based on numpy",
     download_url = "http://pypi.python.org/pypi/quantities",
     keywords = ['quantities', 'units', 'physical', 'constants'],
