versioning done right

JCStarry · Nov 4, 2018 · 6890a7c · 6890a7c
1 parent 328273b
commit 6890a7c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include donkeycar/templates/*
-recursive-include donkeycar/parts/web_controller/templates/ *
+include VERSION
+recursive-include donkeycar/parts/web_controller/templates/ *
diff --git a/VERSION b/VERSION
diff --git a/donkeycar/__init__.py b/donkeycar/__init__.py
@@ -1,14 +1,13 @@
 import os
 
-# Print version being used.
-package_path = os.path.dirname(os.path.dirname(__file__))
-version_path = os.path.join(package_path, 'VERSION')
-with open(version_path, 'r') as f:
-    version = f.read()
-print('using donkey version: {} ...'.format(version))
+import pkg_resources  # part of setuptools
+import sys
+
+__version__ = pkg_resources.require("donkeycar")[0].version
+print('using donkey version: {} ...'.format(__version__))
+
 
 
-import sys
 current_module = sys.modules[__name__]
 
 

diff --git a/setup.py b/setup.py
@@ -2,19 +2,12 @@
 
 import os
 
-# Print version being used.
-package_path = os.path.dirname(__file__)
-version_path = os.path.join(package_path, 'VERSION')
-with open(version_path, 'r') as f:
-    version = f.read()
-
-
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
 
 setup(name='donkeycar',
-      version=version,
+      version='2.5.2',
       description='Self driving library for python.',
       long_description=long_description,
       long_description_content_type="text/markdown",