Merge pull request #632 from watson-developer-cloud/disable-appscan

chore(appscan): Disable appscan and upddate version
watson-developer-cloud · Jan 23, 2019 · a25669e · a25669e
2 parents 1db670d + 7ced7e8
commit a25669e
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 167 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.3
+current_version = 2.6.0
 commit = True
 
 [bumpversion:file:watson_developer_cloud/version.py]

diff --git a/.travis.yml b/.travis.yml
@@ -13,12 +13,7 @@ install:
 - pip install tox-travis
 - pip install bumpversion
 - npm install @semantic-release/exec
-- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then cd appscan; make asoc-tool; cd
-  ../; fi
-before_script:
-- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then chmod a+x ./appscan/ASOC.sh; fi
 script:
-- if [ "${TRAVIS_TAG}" = "${TRAVIS_BRANCH}" ]; then ./appscan/ASOC.sh; fi
 - pip install -U python-dotenv
 - tox
 before_deploy:

diff --git a/appscan/ASOC.sh b/appscan/ASOC.sh
diff --git a/appscan/Configfile b/appscan/Configfile
diff --git a/appscan/Makefile b/appscan/Makefile
diff --git a/appscan/app.json b/appscan/app.json
diff --git a/appscan/getJson.py b/appscan/getJson.py
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = '2.5.3'
+__version__ = '2.6.0'
 
 if sys.argv[-1] == 'publish':
     # test server

diff --git a/watson_developer_cloud/version.py b/watson_developer_cloud/version.py
@@ -1 +1 @@
-__version__ = '2.5.3'
+__version__ = '2.6.0'