summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-11 19:22:56 +0000
committerAmber Brown <hawkowl@atleastfornow.net>2019-01-12 06:22:56 +1100
commit34b25dcc8ef0d9012eb3b0d9a158e11b159ffce0 (patch)
tree0a14dd11821cc1d25c03e38a908681c7551d19c0
parentRemove duplicates in the user_ips table and add an index (#4370) (diff)
downloadsynapse-34b25dcc8ef0d9012eb3b0d9a158e11b159ffce0.tar.xz
Silence travis-ci build warnings by removing non-functional python3.6 (#4377)
* Remove non-functional python3.6 in travis env

* changelog
-rw-r--r--.travis.yml7
-rw-r--r--changelog.d/4377.misc1
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 728f0e248a..3cab77ce4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,13 @@ matrix:
 
 install:
   - pip install tox
+  
+  # if we don't have python3.6 in this environment, travis unhelpfully gives us
+  # a `python3.6` on our path which does nothing but spit out a warning. Tox
+  # tries to run it (even if we're not running a py36 env), so the build logs
+  # then have warnings which look like errors. To reduce the noise, remove the
+  # non-functional python3.6.
+  - ( ! command -v python3.6 || python3.6 --version ) &>/dev/null || rm -f $(command -v python3.6)
 
 script:
   - tox -e $TOX_ENV
diff --git a/changelog.d/4377.misc b/changelog.d/4377.misc
new file mode 100644
index 0000000000..06273023fc
--- /dev/null
+++ b/changelog.d/4377.misc
@@ -0,0 +1 @@
+Silence travis-ci build warnings by removing non-functional python3.6
\ No newline at end of file