On Tue, 7 Aug 2018 at 18:25, Dylan Baker <dy...@pnwbakers.com> wrote:
> Quoting Rhys Kidd (2018-08-06 18:53:46)
> > Signed-off-by: Rhys Kidd <rhysk...@gmail.com>
> > ---
> > .travis.yml | 3 +++
> > tox.ini | 9 +++++----
> > 2 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index b6e8136e8..45b23f009 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -21,6 +21,9 @@ matrix:
> > env: TOX_ENV="py35-{generator,noaccel,accel-nix,streams}"
> > - python: 3.6
> > env: TOX_ENV="py36-{generator,noaccel,accel-nix,streams}"
> > + - python: 3.7
> > + env: TOX_ENV="py37-{generator,noaccel,accel-nix,streams}"
> > + dist: xenial # required for Python 3.7
> (travis-ci/travis-ci#9069)
> > - env: BUILD=cmake
> >
> > install:
> > diff --git a/tox.ini b/tox.ini
> > index d6dfa5e15..1d6beca1a 100644
> > --- a/tox.ini
> > +++ b/tox.ini
> > @@ -1,5 +1,5 @@
> > [tox]
> > -envlist = py{27,34,35,36}-{generator,noaccel},
> py{27,34,35,36}-accel-{win,nix}, py{27,34,35,36}-streams
> > +envlist = py{27,34,35,36,37}-{generator,noaccel},
> py{27,34,35,36,37}-accel-{win,nix}, py{27,34,35,36,37}-streams
> > skipsdist = True
> >
> > [pytest]
> > @@ -14,12 +14,13 @@ setenv =
> > deps =
> > accel-nix: lxml
> > accel: simplejson
> > - generator: numpy==1.7.0
> > + py{27,34,35,36}-generator: numpy==1.7.0
> > + py37-generator: numpy
>
> I'm assuming that 1.7.0 doesn't work with numpy?
>
Yes, there's a version conflict which can be resolved by bumping up numpy.
> > mock==1.0.1
> > - py27-accel-nix,py{34,35,36}-{accel,noaccel}: psutil
> > + py27-accel-nix,py{34,35,36,37}-{accel,noaccel}: psutil
> > py27-accel-nix: backports.lzma
> > py27-accel-nix: subprocess32
> > - py{35,36}: mako==1.0.2
> > + py{35,36,37}: mako==1.0.2
> > pytest==3.2.5
> > pytest-mock
> > pytest-pythonpath
> > --
> > 2.17.1
> >
>
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
