summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2019-12-20 15:49:09 -0500
committerGitHub <noreply@github.com>2019-12-20 15:49:09 -0500
commit2c77a287a89e8356697fc2c03522e10aa523a512 (patch)
tree47889a9e788a4596b24b31d8696afc963821845a
parentc7dca877c1fa3dc8b63486bb88022ee23a31bebe (diff)
downloadcloud-init-git-2c77a287a89e8356697fc2c03522e10aa523a512.tar.gz
ci: remove Python 2.7 from CI runs (#137)
Specifically, drop it from the default list of environments that tox will run, and from Travis. (We retain the configuration in tox.ini for now, for any remaining Python 2.7 needs.)
-rw-r--r--.travis.yml4
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 9efaad14..15157b86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,10 +43,6 @@ matrix:
- sudo -E su $USER -c 'sbuild --nolog --verbose --dist=xenial cloud-init_*.dsc'
# Ubuntu LTS: Integration
- sg lxd -c 'tox -e citest -- run --verbose --preserve-data --data-dir results --os-name xenial --test modules/apt_configure_sources_list.yaml --test modules/ntp_servers --test modules/set_password_list --test modules/user_groups --deb cloud-init_*_all.deb'
- - python: 2.7
- env:
- TOXENV=py27
- NOSE_VERBOSE=2 # List all tests run by nose
- python: 3.4
env:
TOXENV=xenial
diff --git a/tox.ini b/tox.ini
index 846e7e3f..8612f034 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py27, py3, xenial, pycodestyle, pyflakes, pylint
+envlist = py3, xenial, pycodestyle, pyflakes, pylint
recreate = True
[testenv]