diff --git a/.travis.yml b/.travis.yml index dec435604..40f351ae6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,7 @@ env: - TAHOE_LAFS_HYPOTHESIS_PROFILE=ci install: -# ~/.local/bin is on $PATH by default, but on OS-X, --user puts it elsewhere - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export PATH=$HOME/Library/Python/2.7/bin:$PATH; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then wget https://bootstrap.pypa.io/get-pip.py && sudo python ./get-pip.py; fi - - pip list - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then pip install --user --upgrade codecov tox setuptools virtualenv; fi - - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then pip install --upgrade codecov tox setuptools virtualenv; fi + - pip install --upgrade tox setuptools virtualenv - echo $PATH; which python; which pip; which tox - python misc/build_helpers/show-tool-versions.py @@ -25,13 +20,6 @@ script: - | set -eo pipefail tox -e ${T} - # To verify that the resultant PyInstaller-generated binary executes - # cleanly (i.e., that it terminates with an exit code of 0 and isn't - # failing due to import/packaging-related errors, etc.). - if [ "${T}" = "pyinstaller" ]; then dist/Tahoe-LAFS/tahoe --version; fi - -after_success: - - if [ "${T}" = "coverage" ]; then codecov; fi notifications: email: false @@ -45,26 +33,6 @@ notifications: matrix: include: - - os: linux - python: '2.7' - env: T=coverage LANG=en_US.UTF-8 - - os: linux - python: '2.7' - env: T=codechecks LANG=en_US.UTF-8 - - os: linux - python: '2.7' - env: T=pyinstaller LANG=en_US.UTF-8 - - os: linux - python: '2.7' - env: T=py27 LANG=C - - os: osx - python: '2.7' - env: T=py27 LANG=en_US.UTF-8 - language: generic # "python" is not available on OS-X - - os: osx - python: '2.7' - env: T=pyinstaller LANG=en_US.UTF-8 - language: generic # "python" is not available on OS-X - os: linux python: '3.6' env: T=py36 diff --git a/newsfragments/3330.minor b/newsfragments/3330.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3331.minor b/newsfragments/3331.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3332.minor b/newsfragments/3332.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3333.minor b/newsfragments/3333.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3334.minor b/newsfragments/3334.minor new file mode 100644 index 000000000..e69de29bb diff --git a/newsfragments/3335.minor b/newsfragments/3335.minor new file mode 100644 index 000000000..e69de29bb