From ae94d2010476e4d6ed7a1258ec21f222611f3f64 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 2 Apr 2020 12:32:51 +0200 Subject: [PATCH] tox.ini: add configuration for py3 (#41219) --- getlasso3.sh | 22 ++++++++++++++++++++++ tox.ini | 10 ++++------ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100755 getlasso3.sh diff --git a/getlasso3.sh b/getlasso3.sh new file mode 100755 index 0000000..9266a72 --- /dev/null +++ b/getlasso3.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Get venv site-packages path +DSTDIR=`python3 -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 python3 -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 /usr/lib/python3/dist-packages/lasso.py $DSTDIR/ +for SOFILE in /usr/lib/python3/dist-packages/_lasso.cpython-*.so +do + ln -sv $SOFILE $DSTDIR/ +done + +exit 0 diff --git a/tox.ini b/tox.ini index b9d6436..25c2cde 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic2-auth-kerberos/ -envlist = py27-coverage-dj111-{oldldap,},pylint +envlist = py27-coverage-dj111{-oldldap,},py3-coverage-dj111,pylint [testenv] whitelist_externals = @@ -28,10 +28,6 @@ setenv = usedevelop = coverage: true deps = - dj18: django>1.8,<1.9 - dj18: django-tables2<1.1 - dj18: django-jsonfield<1.1 - dj18: django-model-utils<3.2 dj111: django>1.11,<1.12 dj111: django-tables<2.0 psycopg2-binary @@ -43,8 +39,10 @@ deps = http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.bz2 oldldap: python-ldap<3 django-webtest + py27: django-appconf<1.0.4 commands = - ./getlasso.sh + py27: ./getlasso.sh + py3: ./getlasso3.sh py.test {env:COVERAGE:} {env:JUNIT:} {posargs:tests} [testenv:pylint]