From f456c8beb809b447527d378ef6b29a431b1b09cc Mon Sep 17 00:00:00 2001 From: wopeizl Date: Fri, 10 May 2019 10:05:24 +0800 Subject: [PATCH] rename the default version from '0.0.0' to 'latest' (#17304) * rename the default version from '0.0.0' to 'latest' --- cmake/version.cmake | 16 +++++++++------- .../paddle/fluid/tests/unittests/test_version.py | 10 +++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index dd57d4ab996..f7b065b582c 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -3,6 +3,8 @@ set(PADDLE_VERSION $ENV{PADDLE_VERSION}) set(tmp_version "HEAD") set(TAG_VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(\\.(a|b|rc)\\.[0-9]+)?") set(COMMIT_VERSION_REGEX "[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+") +set(LATEST_PADDLE_VERSION "latest") + while ("${PADDLE_VERSION}" STREQUAL "") # Check current branch name execute_process( @@ -23,8 +25,8 @@ while ("${PADDLE_VERSION}" STREQUAL "") if (${GIT_BRANCH_NAME} MATCHES "release/${TAG_VERSION_REGEX}") # Check the tag is a correct version if (${GIT_TAG_NAME} MATCHES "${COMMIT_VERSION_REGEX}") - # if no tag was found, set PADDLE_VERSION to 0.0.0 to represent latest - set(PADDLE_VERSION "0.0.0") + # if no tag was found, set PADDLE_VERSION to "latest" + set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}") elseif (${GIT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}") string(REPLACE "v" "" PADDLE_VERSION ${GIT_TAG_NAME}) else() # otherwise, get the previous git tag name. @@ -42,19 +44,19 @@ while ("${PADDLE_VERSION}" STREQUAL "") if (${GIT_EXACT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}") string(REPLACE "v" "" PADDLE_VERSION ${GIT_EXACT_TAG_NAME}) else() - set(PADDLE_VERSION "0.0.0") + set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}") endif() else() - # otherwise, we always set PADDLE_VERSION to 0.0.0 to represent latest - set(PADDLE_VERSION "0.0.0") + # otherwise, we always set PADDLE_VERSION to "latest" + set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}") endif() endif() else() - set(PADDLE_VERSION "0.0.0") + set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}") message(WARNING "Cannot add paddle version from git tag") endif() else() - set(PADDLE_VERSION "0.0.0") + set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}") message(WARNING "Cannot add paddle version for wrong git branch result") endif() endwhile() diff --git a/python/paddle/fluid/tests/unittests/test_version.py b/python/paddle/fluid/tests/unittests/test_version.py index 42a0e5c802c..a3927ef11d3 100644 --- a/python/paddle/fluid/tests/unittests/test_version.py +++ b/python/paddle/fluid/tests/unittests/test_version.py @@ -30,18 +30,14 @@ class VersionTest(unittest.TestCase): self._commit_regex = "[0-9a-f]{5,49}" def test_check_output(self): - # check commit format - self.assertTrue(re.match(self._commit_regex, fluid_version.commit)) self.assertTrue(isinstance(fluid_version.istaged, bool)) # check version format if fluid_version.istaged: - self.assertEqual(fluid_version.major, 0) - self.assertEqual(fluid_version.minor, 0) - self.assertEqual(fluid_version.patch, "0") - self.assertEqual(fluid_version.rc, 0) - self.assertEqual(fluid_version.full_version, "0.0.0") + self.assertEqual(fluid_version.full_version, "latest") else: + # check commit format + self.assertTrue(re.match(self._commit_regex, fluid_version.commit)) self.assertTrue(re.match(self._major_regex, fluid_version.major)) self.assertTrue(re.match(self._minor_regex, fluid_version.minor)) self.assertTrue(re.match(self._patch_regex, fluid_version.patch)) -- GitLab