From 7a5af339a4fc7d040f295e213ca18106060837dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 28 Jan 2020 13:33:58 +0100 Subject: [PATCH] tox: stop testing against python 2 (#39330) --- getlasso.sh | 20 -------------------- tox.ini | 9 +++------ 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100755 getlasso.sh diff --git a/getlasso.sh b/getlasso.sh deleted file mode 100755 index 680da393..00000000 --- a/getlasso.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Get venv site-packages path -DSTDIR=`python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'` - -# Get not venv site-packages path -# Remove first path (assuming that is the venv path) -NONPATH=`echo $PATH | sed 's/^[^:]*://'` -SRCDIR=`PATH=$NONPATH python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'` - -# Clean up -rm -f $DSTDIR/lasso.* -rm -f $DSTDIR/_lasso.* - -# Link -ln -sv $SRCDIR/lasso.py $DSTDIR -ln -sv $SRCDIR/_lasso.* $DSTDIR - -exit 0 - diff --git a/tox.ini b/tox.ini index 35cc24c4..c1e65ddf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/combo/{env:BRANCH_NAME:} -envlist = coverage-py2-pylint,py3 +envlist = coverage-py3-pylint [testenv] usedevelop = True @@ -25,15 +25,12 @@ deps = django-webtest<1.9.3 psycopg2 django-mellon>=1.13 - py2: django-jsonfield<1.3 - py2: quixote<3.0 - py3: quixote>=3.0 + quixote>=3.0 vobject django-ratelimit<3 git+http://git.entrouvert.org/debian/django-ckeditor.git commands = - py2: ./getlasso.sh - py3: ./getlasso3.sh + ./getlasso3.sh ./get_wcs.sh python manage.py compilemessages py.test {env:COVERAGE:} {posargs: --junitxml=junit-{envname}.xml tests/}