Browse files

Merge branch 'versioning'

  • Loading branch information...
2 parents a0495af + 4547ce6 commit 4220b0a1144c215b3a4dd4804244fa68b2ec2ac0 @ddale ddale committed Mar 12, 2012
Showing with 9 additions and 1 deletion.
  1. +2 −0 hexrd/__init__.py
  2. +7 −1 setup.py
View
2 hexrd/__init__.py
@@ -24,3 +24,5 @@
# the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307 USA or visit <http://www.gnu.org/licenses/>.
# ============================================================
+
+__version__ = '0.0.0'
View
8 setup.py
@@ -45,9 +45,15 @@
else:
del(dirnames[:])
+with open('hexrd/__init__.py') as f:
+ for line in f:
+ if line[:11] == '__version__':
+ exec(line)
+ break
+
setup(
name = 'hexrd',
- version = '0.0.0',
+ version = __version__,
author = 'Joel Bernier, et al.',
author_email = 'bernier2@llnl.gov',
description = 'High energy diffraction microscopy',

0 comments on commit 4220b0a

Please sign in to comment.