Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix variable names for building from source distribution #337

Merged
merged 1 commit into from
Dec 23, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ def write_version_py(filename=_VERSION_FILENAME):
elif os.path.exists(filename):
# must be a source distribution, use existing version file
try:
git_revision, full_version = read_version_py(chaco_version_path)
git_rev, fullversion = read_version_py(chaco_version_path)
except (SyntaxError, KeyError):
raise RuntimeError("Unable to read git_revision. Try removing "
"chaco/_version.py and the build directory "
"before building.")


match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_v)
match = re.match(r'.*?\.dev(?P<dev_num>\d+)', fullversion)
if match is None:
dev_num = '0'
else:
Expand Down