diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-10-31 11:49:45 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-02-13 19:09:15 +0000 |
| commit | 802aeb7ed747931d42e79eb42ecd52f385baef3a (patch) | |
| tree | e04429b6f802421724536a5278721abe4b43d70a | |
| parent | 183fc1ba9fb37a3319b463b3ca7833171fd37e53 (diff) | |
CI: remove python 2.7 and 3.5
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/merge_requests/223>
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tox.ini | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 2c5d48d1a..69b9ecfb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,6 @@ services: matrix: include: - - python: 2.7 - env: TOX_ENV="py27-{generator,noaccel,accel-nix,streams}" - - python: 3.5 - env: TOX_ENV="py35-{generator,noaccel,accel-nix,streams}" - python: 3.6 env: TOX_ENV="py36-{generator,noaccel,accel-nix,streams}" - python: 3.7 @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35,36,37,38}-{generator,noaccel}, py{27,35,36,37,38}-accel-{win,nix}, py{27,35,36,37,38}-streams +envlist = py{36,37,38}-{generator,noaccel}, py{36,37,38}-accel-{win,nix}, py{36,37,38}-streams skipsdist = True [pytest] @@ -14,24 +14,20 @@ setenv = deps = accel-nix: lxml accel: simplejson - py{27,35,36}-generator: numpy==1.7.0 + py36-generator: numpy==1.7.0 py{37,38}-generator: numpy mock==1.0.1 - py27-accel-nix,py{35,36,37,38}-{accel,noaccel}: psutil - py27-accel-nix: backports.lzma - py27-accel-nix: subprocess32 - py{35,36,37}: mako==1.0.2 + py{36,37}: mako==1.0.2 py38: mako==1.0.8 pytest==3.2.5 pytest-mock==1.11.2 pytest-pythonpath pytest-raises pytest-timeout==1.2.1 - py27: mako==0.8.0 six==1.5.2 {accel,noaccel,streams}: jsonschema streams: jsonstreams>=0.4.1 -commands = +commands = {accel,noaccel}: py.test -rw unittests/framework unittests/suites [] generator: py.test -rw unittests/generators [] streams: py.test -rw unittests/framework/backends/test_json.py [] |