From 0b6e627306b87b63eae0db5daf7ffd41fb708684 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Wed, 30 Oct 2019 16:14:14 +0100
Subject: [PATCH] update travis

---
 .travis.yml              | 5 +++--
 wo/cli/plugins/site.py   | 7 ++-----
 wo/cli/plugins/update.py | 9 +++------
 wo/core/download.py      | 2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08d99e6..ebeaa10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
 
 
 after_script:
-  - sudo bash install --purge
+  - sudo -E bash install --purge
 
 
 script:
@@ -31,6 +31,7 @@ script:
   - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
   - sudo -E time bash install --travis -b "$TRAVIS_BRANCH"
+  - sudo -E python3 -m pip install -U -r requirements.txt
   - sudo -E time bash tests/travis.sh
-  - sudo wo update --travis
+  - sudo -E wo update --travis
   - sudo python3 setup.py sdist bdist_wheel
\ No newline at end of file
diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py
index 31373ab..cb65342 100644
--- a/wo/cli/plugins/site.py
+++ b/wo/cli/plugins/site.py
@@ -999,10 +999,7 @@ class WOSiteUpdateController(CementBaseController):
             check_ssl = check_site.is_ssl
             check_php_version = check_site.php_version
 
-            if check_php_version == "7.3":
-                old_php73 = True
-            else:
-                old_php73 = False
+            old_php73 = bool(check_php_version == "7.3")
 
         if (pargs.password and not (pargs.html or
                                     pargs.php or pargs.php73 or pargs.mysql or
@@ -1378,7 +1375,7 @@ class WOSiteUpdateController(CementBaseController):
 
         if 'proxy' in data.keys() and data['proxy']:
             updateSiteInfo(self, wo_domain, stype=stype, cache=cache,
-                           ssl=True if check_site.is_ssl else False)
+                           ssl=(bool(check_site.is_ssl)))
             Log.info(self, "Successfully updated site"
                      " http://{0}".format(wo_domain))
             return 0
diff --git a/wo/cli/plugins/update.py b/wo/cli/plugins/update.py
index bef21d2..f0fcad7 100644
--- a/wo/cli/plugins/update.py
+++ b/wo/cli/plugins/update.py
@@ -45,9 +45,6 @@ class WOUpdateController(CementBaseController):
         pargs = self.app.pargs
         filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S")
 
-        wo_current = WOVar.wo_version
-        wo_latest = WODownload.latest_release(self, "WordOps/WordOps")
-
         install_args = ""
         if pargs.mainline or pargs.beta:
             wo_branch = "mainline"
@@ -64,6 +61,8 @@ class WOUpdateController(CementBaseController):
         if ((not pargs.force) and (not pargs.travis) and
             (not pargs.mainline) and (not pargs.beta) and
                 (not pargs.branch)):
+            wo_current = WOVar.wo_version
+            wo_latest = WODownload.latest_release(self, "WordOps/WordOps")
             if wo_current == wo_latest:
                 Log.error(
                     self, "WordOps {0} is already installed"
@@ -78,9 +77,7 @@ class WOUpdateController(CementBaseController):
                                     "update script"]])
 
         if os.path.isfile('install'):
-            Log.info(self, "updating WordOps from local install\n"
-                     "Latest public release = {0}".format(wo_latest))
-
+            Log.info(self, "updating WordOps from local install\n")
             try:
                 Log.info(self, "updating WordOps, please wait...")
                 os.system("/bin/bash install --travis")
diff --git a/wo/core/download.py b/wo/core/download.py
index c40e8c9..a67c486 100644
--- a/wo/core/download.py
+++ b/wo/core/download.py
@@ -44,9 +44,9 @@ class WODownload():
                 'https://api.github.com/repos/{0}/releases/latest'
                 .format(repository),
                 timeout=(5, 30))
+            github_json = req.json()
         except requests.RequestException as e:
             Log.debug(self, str(e))
             Log.error(self, "Unable to query GitHub API")
 
-        github_json = req.json()
         return github_json["tag_name"]