Skip to content

Commit bbf7941

Browse files
Revert travis changes [ubuntu & python upgrade] (#320)
* Revert "Move to xenial (Ubuntu 16.04) for Travis CI (#319)" This reverts commit eb543ee. * Revert "Add Python 3.7 and 3.8 (#318)" This reverts commit 75217a4. Co-authored-by: bogdan kyryliuk <bogdankyryliuk@dropbox.com>
1 parent eb543ee commit bbf7941

2 files changed

Lines changed: 10 additions & 15 deletions

File tree

.travis.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
sudo: required
22
language: python
3-
dist: xenial
3+
dist: trusty
44
matrix:
55
include:
66
# https://docs.python.org/devguide/#status-of-python-branches
77
# One build pulls latest versions dynamically
8-
- python: 3.8
9-
env: CDH=cdh5 CDH_VERSION=5 PRESTO=RELEASE
10-
- python: 3.7
11-
env: CDH=cdh5 CDH_VERSION=5 PRESTO=RELEASE
128
- python: 3.6
13-
env: CDH=cdh5 CDH_VERSION=5 PRESTO=RELEASE
9+
env: CDH=cdh5 CDH_VERSION=5 PRESTO=RELEASE SQLALCHEMY=sqlalchemy>=1.3.0
1410
- python: 3.6
15-
env: CDH=cdh5 CDH_VERSION=5.11 PRESTO=0.147
11+
env: CDH=cdh5 CDH_VERSION=5.10.1 PRESTO=0.147 SQLALCHEMY=sqlalchemy>=1.3.0
1612
- python: 3.5
17-
env: CDH=cdh5 CDH_VERSION=5.11 PRESTO=0.147
13+
env: CDH=cdh5 CDH_VERSION=5.10.1 PRESTO=0.147 SQLALCHEMY=sqlalchemy>=1.3.0
1814
- python: 3.4
19-
env: CDH=cdh5 CDH_VERSION=5.11 PRESTO=0.147
15+
env: CDH=cdh5 CDH_VERSION=5.10.1 PRESTO=0.147 SQLALCHEMY=sqlalchemy>=1.3.0
2016
- python: 2.7
21-
env: CDH=cdh5 CDH_VERSION=5.11 PRESTO=0.147
22-
addons:
23-
apt:
24-
packages:
25-
- oracle-java8-installer
17+
env: CDH=cdh5 CDH_VERSION=5.10.1 PRESTO=0.147 SQLALCHEMY=sqlalchemy>=1.3.0
2618
install:
2719
- ./scripts/travis-install.sh
2820
- pip install codecov

scripts/travis-install.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ deb-src https://archive.cloudera.com/${CDH}/ubuntu/${DISTRIB_CODENAME}/amd64/cdh
77
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 327574EE02A818DD
88
sudo apt-get -q update
99

10-
sudo apt-get -q install -y python-dev g++ libsasl2-dev maven
10+
sudo apt-get -q install -y oracle-java8-installer python-dev g++ libsasl2-dev maven
11+
sudo update-java-alternatives -s java-8-oracle
1112

1213
#
1314
# LDAP
@@ -64,6 +65,8 @@ cp -r $(dirname $0)/travis-conf/presto presto-server/etc
6465
#
6566
# Python
6667
#
68+
69+
pip install $SQLALCHEMY
6770
pip install -e .
6871
pip install -r dev_requirements.txt
6972

0 commit comments

Comments
 (0)