Get the right virtualenv package

This commit is contained in:
Jean-Paul Calderone 2018-06-15 15:34:21 -04:00
parent 0aab633db9
commit 13214437bf
2 changed files with 5 additions and 3 deletions

View File

@ -21,5 +21,4 @@ apt-get --quiet --yes install \
libffi-dev \ libffi-dev \
libssl-dev \ libssl-dev \
libyaml-dev \ libyaml-dev \
virtualenv \
${EXTRA_PACKAGES} ${EXTRA_PACKAGES}

View File

@ -45,6 +45,8 @@ jobs:
# Tell the C runtime things about character encoding (mainly to do with # Tell the C runtime things about character encoding (mainly to do with
# filenames and argv). # filenames and argv).
LANG: "en_US.UTF-8" LANG: "en_US.UTF-8"
# The package name for this software varies somewhat across distros.
EXTRA_PACKAGES: "virtualenv"
# Select a tox environment to run for this job. # Select a tox environment to run for this job.
TAHOE_LAFS_TOX_ENVIRONMENT: "coverage" TAHOE_LAFS_TOX_ENVIRONMENT: "coverage"
# Additional arguments to pass to tox. # Additional arguments to pass to tox.
@ -124,7 +126,7 @@ jobs:
environment: environment:
<<: *UTF_8_ENVIRONMENT <<: *UTF_8_ENVIRONMENT
# Necessary for en_US LANG setting. # Necessary for en_US LANG setting.
EXTRA_PACKAGES: "language-pack-en" EXTRA_PACKAGES: "virtualenv language-pack-en"
ubuntu-18.04: ubuntu-18.04:
@ -135,7 +137,7 @@ jobs:
environment: environment:
<<: *UTF_8_ENVIRONMENT <<: *UTF_8_ENVIRONMENT
# Necessary for automatic address detection/assignment. # Necessary for automatic address detection/assignment.
EXTRA_PACKAGES: "iproute2" EXTRA_PACKAGES: "virtualenv iproute2"
centos-7: &RHEL_DERIV centos-7: &RHEL_DERIV
@ -209,6 +211,7 @@ jobs:
environment: environment:
<<: *UTF_8_ENVIRONMENT <<: *UTF_8_ENVIRONMENT
EXTRA_PACKAGES: "python-virtualenv"
TAHOE_LAFS_TOX_ARGS: "-- allmydata.test.test_magic_folder" TAHOE_LAFS_TOX_ARGS: "-- allmydata.test.test_magic_folder"
# Unfortunately, duplicate all the steps here but run with `sudo`. # Unfortunately, duplicate all the steps here but run with `sudo`.