Merge pull request #1144 from zhangjun/add-version

add VERSION_TAG for python wheel

CMakeLists.txt

@@ -60,6 +60,13 @@ option(WITH_TRT             "Compile Paddle Serving with TRT"
 option(PADDLE_ON_INFERENCE  "Compile for encryption"                             ON)
 option(WITH_OPENCV	    "Compile Paddle Serving with OPENCV"                    OFF)
 
+if(NOT DEFINED VERSION_TAG)
+  set(VERSION_TAG "0.0.0")
+endif()
+if (WITH_PYTHON)
+  message(STATUS "Compile Version Tag for wheel: ${VERSION_TAG}")
+endif()
+
 if (WITH_OPENCV)
     SET(OPENCV_DIR "" CACHE PATH "Location of libraries")
     if(NOT DEFINED OPENCV_DIR)

python/gen_version.py

@@ -47,3 +47,5 @@ elif package_name.endswith('xpu'):
 path = "paddle_serving_" + sys.argv[1]
 commit_id = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
 update_info(path + "/version.py", "commit_id", commit_id)
+
+update_info(path + "/version.py", "version_tag", "${VERSION_TAG}")

python/paddle_serving_app/__init__.py

@@ -12,3 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from .models import ServingModels
+from . import version
+
+__version__ = version.version_tag

python/paddle_serving_app/version.py

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ Paddle Serving App version string """
-serving_app_version = "0.0.0"
+version_tag = "0.0.0"
 commit_id = ""

python/paddle_serving_client/__init__.py

@@ -17,4 +17,4 @@ from . import version
 from . import client
 from .client import *
 
-__version__ = version.serving_client_version
+__version__ = version.version_tag

python/paddle_serving_client/version.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ Paddle Serving Client version string """
-serving_client_version = "0.0.0"
-serving_server_version = "0.0.0"
+version_tag = "0.0.0"
 module_proto_version = "0.0.0"
 commit_id = ""

python/paddle_serving_server/__init__.py

@@ -31,4 +31,4 @@ from paddle_serving_server import (
 from .dag import *
 from .server import *
 
-__version__ = version.serving_server_version
+__version__ = version.version_tag

python/paddle_serving_server/server.py

@@ -22,7 +22,7 @@ from .proto import general_model_config_pb2 as m_config
 from .proto import multi_lang_general_model_service_pb2_grpc
 import google.protobuf.text_format
 import time
-from .version import serving_server_version, version_suffix, device_type
+from .version import version_tag, version_suffix, device_type
 from contextlib import closing
 import argparse
 
@@ -369,7 +369,7 @@ class Server(object):
         version_file = open("{}/version.py".format(self.module_path), "r")
 
         folder_name = "serving-%s-%s" % (self.get_serving_bin_name(),
-                                         serving_server_version)
+                                         version_tag)
         tar_name = "%s.tar.gz" % folder_name
         bin_url = "https://paddle-serving.bj.bcebos.com/bin/%s" % tar_name
 

python/paddle_serving_server/version.py

@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ Paddle Serving Server version string """
-serving_client_version = "0.0.0"
-serving_server_version = "0.0.0"
-module_proto_version = "0.0.0"
+version_tag = "0.0.0"
 version_suffix = ""
+module_proto_version = "0.0.0"
 device_type = "0"
 cuda_version = "9"
 commit_id = ""

python/setup.py.app.in

@@ -22,7 +22,7 @@ import os
 from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
-from paddle_serving_app.version import serving_app_version
+from paddle_serving_app.version import version_tag
 from pkg_resources import DistributionNotFound, get_distribution
         
 def python_version():
@@ -78,7 +78,7 @@ package_dir={'paddle_serving_app':
 
 setup(
     name='paddle-serving-app',
-    version=serving_app_version.replace('-', ''),
+    version=version_tag.replace('-', ''),
     description=
     ('Paddle Serving Package for saved model with PaddlePaddle'),
     url='https://github.com/PaddlePaddle/Serving',

python/setup.py.client.in

@@ -22,7 +22,7 @@ import sys
 from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
-from paddle_serving_client.version import serving_client_version
+from paddle_serving_client.version import version_tag
 import util
 
 py_version = sys.version_info
@@ -79,7 +79,7 @@ package_dir={'paddle_serving_client':
 
 setup(
     name='paddle-serving-client',
-    version=serving_client_version.replace('-', ''),
+    version=version_tag.replace('-', ''),
     description=
     ('Paddle Serving Package for saved model with PaddlePaddle'),
     url='https://github.com/PaddlePaddle/Serving',

python/setup.py.in

@@ -19,7 +19,7 @@ from __future__ import print_function
 from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
-from paddle_serving.version import serving_client_version
+from paddle_serving.version import version_tag
 from grpc_tools import protoc
 import util
 
@@ -43,7 +43,7 @@ package_dir={'paddle_serving.serving_client':
 
 setup(
     name='paddle-serving-client',
-    version=serving_client_version.replace('-', ''),
+    version=version_tag.replace('-', ''),
     description=
     ('Paddle Serving Package for saved model with PaddlePaddle'),
     url='https://github.com/PaddlePaddle/Serving',

python/setup.py.server.in

@@ -19,10 +19,10 @@ from __future__ import print_function
 from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
-from paddle_serving_server.version import serving_server_version, version_suffix
+from paddle_serving_server.version import version_tag, version_suffix
 import util
 
-package_version = serving_server_version.replace('-', '')
+package_version = version_tag.replace('-', '')
 if version_suffix != "":
     version_suffix = "post" + version_suffix
     package_version = package_version + "." + version_suffix