Get rid of the fancy magic of preinstalling Python versions

This commit is contained in:
Dave Halter
2018-12-16 18:58:04 +01:00
parent ed90a69e2c
commit b561d1fc17
2 changed files with 4 additions and 48 deletions

View File

@@ -1,5 +1,4 @@
language: python language: python
sudo: true
python: python:
- 2.7 - 2.7
- 3.4 - 3.4
@@ -14,37 +13,27 @@ env:
- JEDI_TEST_ENVIRONMENT=36 - JEDI_TEST_ENVIRONMENT=36
- JEDI_TEST_ENVIRONMENT=37 - JEDI_TEST_ENVIRONMENT=37
addons:
apt:
packages:
# Required to properly create a virtual environment with system Python 3.4.
- python3.4-venv
matrix: matrix:
allow_failures: allow_failures:
- python: pypy - python: pypy
- env: TOXENV=sith - env: TOXENV=sith
include: include:
- python: 3.6 - python: 3.6
env: env:
- TOXENV=cov - TOXENV=cov
- JEDI_TEST_ENVIRONMENT=36 - JEDI_TEST_ENVIRONMENT=36
- python: 3.6 - python: 3.6
env: TOXENV=sith env: TOXENV=sith
# For now ignore pypy, there are so many issues that we don't really need # For now ignore pypy, there are so many issues that we don't really need
# to run it. # to run it.
#- python: pypy #- python: pypy
- python: "nightly" - python: "nightly"
env: env:
- JEDI_TEST_ENVIRONMENT=36 - JEDI_TEST_ENVIRONMENT=36
before_install:
- ./travis_install.sh
# Need to add the path to the Python versions in the end. This might add
# something twice, but it doesn't really matter, because they are appended.
- export PATH=$PATH:/opt/python/3.5/bin
# 3.6 was not installed manually, but already is on the system. However
# it's not on path (unless 3.6 is selected).
- export PATH=$PATH:/opt/python/3.6/bin
install: install:
- pip install --quiet tox-travis - pip install --quiet tox-travis
script: script:

View File

@@ -1,33 +0,0 @@
#! /usr/bin/env bash
set -e
# 3.6 is already installed on Travis but not as root. This is problematic for
# our virtualenv tests because we require the Python used to create a virtual
# environment to be owned by root (or to be in a safe location which is not the
# case here).
sudo chown root: /opt/python/3.6/bin/python
sudo chown root: /opt/python/3.6.3/bin/python
if [[ $JEDI_TEST_ENVIRONMENT == "35" ]]; then
VERSION=3.5
DOWNLOAD=1
fi
if [[ -z $VERSION ]]; then
echo "Environments should already be installed"
exit 0
fi
PYTHON=python-$VERSION
# Check if the desired Python version already exists.
$PYTHON --version && exit 0 || true
if [[ $DOWNLOAD == 1 ]]; then
# Otherwise download and install.
DOWNLOAD_NAME=python-$VERSION
wget https://s3.amazonaws.com/travis-python-archives/binaries/ubuntu/14.04/x86_64/$DOWNLOAD_NAME.tar.bz2
sudo tar xjf $DOWNLOAD_NAME.tar.bz2 --directory /
fi
echo "Successfully installed environment."