Merge branch 'master' into public_master

- set correct version number - add __version__ information
DLR-RM · Apr 10, 2017 · 9a188f0 · 9a188f0
2 parents 6384f66 + 7de4731
commit 9a188f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 
 setup(
     name='jsonconversion',
-    version='0.2.2',
+    version='0.2.3',
     url='https://github.com/DLR-RM/python-jsonconversion',
     download_url='https://github.com/DLR-RM/python-jsonconversion/archive/0.2.2.tar.gz',
     license='BSD',

diff --git a/src/jsonconversion/__init__.py b/src/jsonconversion/__init__.py
@@ -8,3 +8,10 @@
 # Contributors:
 # Franz Steinmetz <franz.steinmetz@dlr.de>
 
+from pkg_resources import get_distribution, DistributionNotFound
+
+try:
+    __version__ = get_distribution("jsonconversion").version
+except DistributionNotFound:
+    __version__ = "unknown"
+