Correct version handling

Wolfrax · Aug 4, 2017 · 2a126c3 · 2a126c3
1 parent f53af5f
commit 2a126c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/radar/__init__.py b/radar/__init__.py
@@ -1,6 +1,7 @@
 from pkg_resources import get_distribution, DistributionNotFound
 import os.path
 
+VERSION = "2.1"
 
 try:
  _dist = get_distribution('spots')
@@ -9,6 +10,6 @@
  if not here.startswith(os.path.join(dist_loc, 'spots')):
  raise DistributionNotFound
 except DistributionNotFound:
- __version__ = "Please install this project with setup.py"
+ __version__ = VERSION
 else:
  __version__ = _dist.version
diff --git a/setup.py b/setup.py
@@ -1,11 +1,12 @@
 from setuptools import setup, find_packages
+from .radar import __version__
 
 with open('README') as f:
  long_description = f.read()
 
 setup(
  name='spots',
- version='2.1',
+ version=__version__,
  packages=find_packages(),
  data_files=[('', ['adsb-packet.png', 'spots.png', 'LICENSE.txt', 'README.md', 'README']),
  ('client', ['map.html', 'spots.html', 'spots.js']),