Skip to content

Commit 77704a1

Browse files
committed
Avoid repetition of the version number.
The old setup.py resulted in a version number that looked like e.g. 5.7.15.7.1 when running setup.py. With this change, we get a correct version number; e.g. 5.7.1.
1 parent a2991bb commit 77704a1

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

setup.py

-5
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,13 @@ def write_version_py(filename=version_file_path):
104104

105105
cnt = """
106106
# This file is generated by clawpack/setup.py.
107-
short_version = '%(version)s'
108107
version = '%(version)s'
109-
full_version = '%(full_version)s'
110108
git_revision = '%(git_revision)s'
111109
"""
112110
# Adding the git rev number needs to be done inside
113111
# write_version_py(), otherwise the import of clawpack.version messes
114112
# up the build under Python 3.
115113

116-
FULLVERSION = VERSION
117114
if os.path.exists('.git'):
118115
GIT_REVISION = git_version()
119116
elif os.path.exists(version_file_path):
@@ -124,7 +121,6 @@ def write_version_py(filename=version_file_path):
124121

125122
with open(filename, 'w') as a:
126123
a.write(cnt % {'version': VERSION,
127-
'full_version' : FULLVERSION,
128124
'git_revision' : GIT_REVISION})
129125

130126
del sys.path[0]
@@ -230,7 +226,6 @@ def setup_package(setup_dict, subpackages):
230226
license = 'BSD',
231227
classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
232228
platforms = ["Linux", "Solaris", "Mac OS-X", "Unix"],
233-
version = VERSION,
234229
)
235230

236231
# python setup.py git-dev sets up subpackages

0 commit comments

Comments
 (0)