Skip to content

Commit

Permalink
Let's try another approach ..
Browse files Browse the repository at this point in the history
  • Loading branch information
xolox committed Sep 6, 2019
1 parent 94a1ffb commit 71736f0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: python
dist: xenial
matrix:
include:
- python: "2.7_with_system_site_packages"
- python: 2.7
- python: 3.4
dist: trusty
- python: 3.5
Expand Down
11 changes: 9 additions & 2 deletions scripts/install-on-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ sudo mknod -m 0666 /dev/random c 1 9
echo HRNGDEVICE=/dev/urandom | sudo tee /etc/default/rng-tools
sudo /etc/init.d/rng-tools restart

# Make python-apt available in the Python virtual environment.
python scripts/link-python-apt.py
# We ignore the Python virtual environment provided by Travis CI and instead
# create our own virtual environment, based on a system wide Python version
# provided by Ubuntu instead of Travis CI. While we're at it we also enable
# access to the system-wide site-packages directory. This is intended to
# enable importing of the apt_pkg module.
INTERPRETER=$(python -c 'import sys; print("/usr/bin/python%i.%i" % sys.version_info[:2])')
echo "Recreating virtual environment ($VIRTUAL_ENV) using $INTERPRETER .."
rm -r $VIRTUAL_ENV
virtualenv --python=$INTERPRETER --system-site-packages $VIRTUAL_ENV

# Install the required Python packages.
pip install --constraint=constraints.txt --requirement=requirements-travis.txt
Expand Down
24 changes: 0 additions & 24 deletions scripts/link-python-apt.py

This file was deleted.

0 comments on commit 71736f0

Please sign in to comment.