Skip to content

Commit 89d7a20

Browse files
author
bpowell
committed
Moved get_version_number function from pycanlib into separate hgversionutils package
1 parent 83c5b2a commit 89d7a20

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

pycanlib/CAN.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,21 @@
22

33
import ctypes
44
import datetime
5-
import subprocess
65
import os
76
import platform
87
import Queue
98
import sys
109
import time
1110
import types
1211

12+
__version__ = "UNKNOWN"
1313

14-
def get_version_number(repo_path):
15-
_current_dir = os.getcwd()
16-
os.chdir(repo_path)
17-
try:
18-
_hg_process = subprocess.Popen(args="hg id", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
19-
(_stdout_output, _stderr_output) = _hg_process.communicate()
20-
retval = _stdout_output.split(" ")[0]
21-
except:
22-
_version_file = open("../version.txt")
23-
retval = _version_file.readline().replace("\n", "")
24-
finally:
25-
os.chdir(_current_dir)
26-
return retval
27-
28-
__version__ = get_version_number(os.path.dirname(__file__))
14+
try:
15+
import hgversionutils
16+
__version__ = hgversionutils.get_version_number(os.path.dirname(__file__))
17+
except ImportError:
18+
with open(os.path.join(os.path.dirname(__file__), "version.txt"), "r") as _version_file:
19+
__version__ = _version_file.readline().replace("\n", "")
2920

3021
canlib.canInitializeLibrary()
3122

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
from setuptools import setup, find_packages
33
import sys
44

5-
sys.path.append(".")
6-
7-
from pycanlib import CAN
5+
import hgversionutils
86

97
if __name__ == "__main__":
10-
_version = CAN.get_version_number(os.path.dirname(__file__))
8+
_version = hgversionutils.get_version_number(os.path.dirname(__file__))
119
_versionNumberFileName = "./pycanlib/version.txt"
1210
_versionFile = open(_versionNumberFileName, "w")
1311
_versionFile.write(_version)

0 commit comments

Comments
 (0)