Skip to content

Commit b2e7585

Browse files
Modernize Travis for new distros and python3
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
1 parent 751eb09 commit b2e7585

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,29 @@ if [ -f /etc/debian_version ]; then
1010
apt-get update
1111
DEBIAN_FRONTEND=noninteractive apt-get -y install $COMPILER pkg-config \
1212
apache2-bin {apache2,libkrb5,libssl,gss-ntlmssp}-dev \
13-
python-{dev,requests,gssapi} lib{socket,nss}-wrapper \
13+
python3-{dev,requests,gssapi} lib{socket,nss}-wrapper \
1414
flex bison krb5-{kdc,admin-server,pkinit} \
1515
flake8 virtualenv
1616
flake8
1717

1818
# remove when python-requests-gssapi is packaged in Debian
19-
virtualenv --system-site-packages .venv
19+
virtualenv -p python3 --system-site-packages .venv
2020
source .venv/bin/activate
2121
pip install requests-gssapi
2222
elif [ -f /etc/redhat-release ]; then
2323
DY=yum
24+
PYTHON=python2
2425
if [ -f /etc/fedora-release ]; then
2526
DY=dnf
27+
PYTHON=python3
2628
fi
2729
$DY -y install $COMPILER python-gssapi krb5-{server,workstation,pkinit} \
2830
{httpd,krb5,openssl,gssntlmssp}-devel {socket,nss}_wrapper \
29-
python-requests autoconf automake libtool which bison make \
30-
flex mod_session redhat-rpm-config python2-virtualenv
31+
autoconf automake libtool which bison make $PYTHON \
32+
flex mod_session redhat-rpm-config /usr/bin/virtualenv
3133

3234
# remove when we're using f28+
33-
virtualenv .venv
35+
virtualenv -p $PYTHON .venv
3436
source .venv/bin/activate
3537
pip install requests{,-gssapi}
3638
if [ x$COMPILER == xclang ]; then

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ services:
77
- docker
88

99
env:
10-
- DISTRO=fedora:27 COMPILER=gcc
11-
- DISTRO=fedora:27 COMPILER=clang
10+
- DISTRO=fedora:latest COMPILER=gcc
11+
- DISTRO=fedora:latest COMPILER=clang
1212
- DISTRO=debian:sid COMPILER=clang
1313
- DISTRO=centos:7 COMPILER=gcc
1414

0 commit comments

Comments
 (0)