From 92df1e21899888035467067466fe715c30bca8e7 Mon Sep 17 00:00:00 2001
From: Steffy-zxf <48793257+Steffy-zxf@users.noreply.github.com>
Date: Mon, 28 Oct 2019 17:13:58 +0800
Subject: [PATCH] merge release/v1.2 to develop (#201)

* upgrade paddlehub version (1.3.0)
---
 paddlehub/version.py | 2 +-
 requirements.txt     | 2 +-
 requirements_py2.txt | 2 +-
 setup.py             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/paddlehub/version.py b/paddlehub/version.py
index 1360cc8e..ccd53742 100644
--- a/paddlehub/version.py
+++ b/paddlehub/version.py
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ PaddleHub version string """
-hub_version = "1.2.1"
+hub_version = "1.3.0"
 module_proto_version = "1.0.0"
diff --git a/requirements.txt b/requirements.txt
index 6c4c9b64..5866e150 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,5 +12,5 @@ pandas
 flask >= 1.1.0
 flake8
 tb-paddle
-tb-nightly
+tensorboard >= 1.15
 cma == 2.7.0
diff --git a/requirements_py2.txt b/requirements_py2.txt
index 8f1412d4..e7e54a3f 100644
--- a/requirements_py2.txt
+++ b/requirements_py2.txt
@@ -11,5 +11,5 @@ pandas < 0.25.0
 flake8
 flask >= 1.1.0
 tb-paddle
-tb-nightly
+tensorboard >= 1.15
 cma == 2.7.0
diff --git a/setup.py b/setup.py
index a4d57db6..76630627 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
     'six >= 1.10.0', 'protobuf >= 3.6.0', 'pyyaml', 'Pillow', 'requests',
-    'tb-paddle', 'tb-nightly', 'cma == 2.7.0', 'flask >= 1.1.0'
+    'tb-paddle', 'tensorboard >= 1.15', 'cma == 2.7.0', 'flask >= 1.1.0'
 ]
 
 if max_version < 3:
-- 
GitLab