Skip to content

Commit

Permalink
Changed version detection
Browse files Browse the repository at this point in the history
  • Loading branch information
hgrecco committed Feb 2, 2014
1 parent 1ca98f9 commit 77e052f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pyvisa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import pkg_resources
import subprocess
import ConfigParser
import vpp43

from . import vpp43

__version__ = "unknown"
try: # try to grab the commit version of our package
Expand All @@ -28,7 +29,7 @@
cwd=os.path.dirname(os.path.abspath(__file__)))).strip()
except: # on any error just try to grab the version that is installed on the system
try:
__version__ = pkg_resources.get_distribution('pint').version
__version__ = pkg_resources.get_distribution('pyvisa').version
except:
pass # we seem to have a local copy without any repository control or installed without setuptools
# so the reported version will be __unknown__
Expand Down

0 comments on commit 77e052f

Please sign in to comment.