From 875c857d47c356518f5b6e1ad5f84dabb088010e Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Mon, 25 May 2020 17:36:22 +0200
Subject: [PATCH] Try to fix some travis issues

---
 .travis.yml                 | 13 ++++++-------
 README_development.rst      |  9 ++-------
 ci/before_install_jython.sh |  1 +
 tox.ini                     |  4 ++--
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 781e7cf..cdedf9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,10 @@
+os: linux
+dist: focal
 language: python
 
-# use container-based infrastructure
-sudo: false
-
 deploy:
   provider: pypi
-  user: cheffe
+  username: cheffe
   password:
     secure: ZQsqnd4Ux3erP0xfLJefJ/90wcJX/L2SfYOZFPbAIwJaX3n9iXf7jOGaT5FzJxLH+c0RJ1varqX0WZo1v0YKRz05IiSCLfZIT3Ia/Cy4nOLLL4a6CFUqzTlO7V1xyKMtQKimWGF5AYTAWvLTPu7cdDeg1YPENrZBYZPvJ/yRiJ4=
   distributions: "sdist bdist_wheel"
@@ -21,14 +20,14 @@ cache:
 
 python:
   - '2.7'
-  - '3.4'
+  - '3.5'
   - '3.6'
 
 env:
-matrix:
+jobs:
   include:
     - python: 3.6
-      env: JYTHON=org.python:jython-installer:2.7.0 TOXENV="jython-driver-{hsqldb,mock}"
+      env: JYTHON=org.python:jython-installer:2.7.2 TOXENV="jython-driver-{hsqldb,mock}"
 
 before_install:
   - ci/before_install.sh
diff --git a/README_development.rst b/README_development.rst
index 312c053..fdd0b14 100644
--- a/README_development.rst
+++ b/README_development.rst
@@ -19,15 +19,10 @@ Setup test requirements
     pip install -rdev-requirements.txt
 
     # Install Jython 2.7
-    ci/mvnget.sh org.python:jython-installer:2.7.0
-    java -jar jython-installer-2.7.0.jar && rm jython-installer-2.7.0.jar
+    ci/mvnget.sh org.python:jython-installer:2.7.2
+    java -jar jython-installer-2.7.2.jar && rm jython-installer-2.7.2.jar
     # add jython to your path
 
-    # Install Python 2.6
-    sudo add-apt-repository ppa:deadsnakes/ppa
-    sudo apt-get update
-    sudo apt-get install python2.6 python2.6-dev
-
     # run tests for all supported envs
     tox
 
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index 8bdb549..e96346a 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -5,6 +5,7 @@ INST_DIR=$HOME/jython/jython-${JYTHON##*:}
 if [ ! -d "$INST_DIR" ]; then
     JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh "$JYTHON")
     java -jar ${JYTHON_JAR} -s -d "$INST_DIR"
+    $HOME/jython/bin/pip install --upgrade pip
 fi
 mkdir -p $HOME/bin
 ln -s "$INST_DIR"/bin/jython $HOME/bin/
diff --git a/tox.ini b/tox.ini
index 2f5cd7d..97707e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial}-newjpype,py{27,3}-driver-{h
 [travis]
 python =
   2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy}-newjpype, py27-driver-{hsqldb,mock}-oldjpype
-  3.4: py34-driver-{hsqldb,mock,sqliteXerial}-newjpype
+  3.5: py34-driver-{hsqldb,mock,sqliteXerial}-newjpype
   3.6: py36-driver-{hsqldb,mock,sqliteXerial}-newjpype, py36-driver-{hsqldb,mock}-oldjpype
 
 [testenv]
@@ -19,7 +19,7 @@ setenv =
   driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
 deps =
   oldjpype: JPype1==0.6.3
-  newjpype: JPype1==0.7.4
+  newjpype: JPype1==0.7.1
   # https://github.com/jiptool/jip/issues/54
   #jip==0.9.14
   https://github.com/jiptool/jip/archive/0.9.14.tar.gz