Commit 26731a7d authored by Bob Obara's avatar Bob Obara Committed by Kitware Robot
Browse files

Merge topic 'changingVersionTo1.1.0'

2a1a7a53

 ENH: Getting ready to release version 1.1.0
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !718
parents df63b3b4 2a1a7a53
...@@ -31,7 +31,7 @@ file(REMOVE ${PROJECT_BINARY_DIR}/SMTKTargets.cmake) ...@@ -31,7 +31,7 @@ file(REMOVE ${PROJECT_BINARY_DIR}/SMTKTargets.cmake)
# SMTK version number # SMTK version number
set(SMTK_VERSION_MAJOR 1) set(SMTK_VERSION_MAJOR 1)
set(SMTK_VERSION_MINOR 0) set(SMTK_VERSION_MINOR 1)
set(SMTK_VERSION_PATCH 0) set(SMTK_VERSION_PATCH 0)
set(SMTK_VERSION set(SMTK_VERSION
"${SMTK_VERSION_MAJOR}.${SMTK_VERSION_MINOR}.${SMTK_VERSION_PATCH}") "${SMTK_VERSION_MAJOR}.${SMTK_VERSION_MINOR}.${SMTK_VERSION_PATCH}")
......
################################## ##################################
SMTK: Simulation Modeling Tool Kit SMTK: Simulation Modeling Tool Kit
Version 1.0.0 Version 1.1.0
################################## ##################################
.. highlight:: c++ .. highlight:: c++
......
...@@ -40,12 +40,11 @@ class Version(unittest.TestCase): ...@@ -40,12 +40,11 @@ class Version(unittest.TestCase):
readme.readline() # Skip title readme.readline() # Skip title
readmeVersion = readme.readline().strip() readmeVersion = readme.readline().strip()
readmeMatch = 'Version %s' % number readmeMatch = 'Version %s' % number
self.assertEqual(readmeVersion, readmeMatch, self.assertEqual(readmeVersion, readmeMatch,
"""Mismatched version numbers in CMakeLists.txt and ReadMe.mkd. """Mismatched version numbers in CMakeLists.txt and doc/index.rst.
Do not take version bumps lightheartedly. Do not take version bumps lightheartedly.
Do not remove this test nor the line in the ReadMe.mkd Do not remove this test nor the line in the doc/index.rst
with the explicit version number; it is your friend. with the explicit version number; it is your friend.
This test exists as a reminder to follow the release This test exists as a reminder to follow the release
...@@ -55,7 +54,10 @@ class Version(unittest.TestCase): ...@@ -55,7 +54,10 @@ class Version(unittest.TestCase):
All tests should be passing and all issues assigned to All tests should be passing and all issues assigned to
the milestone for this release (you **do** have a the milestone for this release (you **do** have a
milestone for this release, right?) have been closed. milestone for this release, right?) have been closed.
""")
From index.rst: %s
From smtkCore (via CMakeLists.txt): %s
""" % (readmeVersion, readmeMatch))
if __name__ == '__main__': if __name__ == '__main__':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment