From 9c6baea77b5f13900d7ac319e21af975ae7f5eca Mon Sep 17 00:00:00 2001 From: Paul Marillonnet Date: Wed, 1 Apr 2020 11:33:35 +0200 Subject: [PATCH] provide a py3-compliant tox.ini file (#41220) --- getlasso3.sh | 22 ++++++++++++++++++++++ tox.ini | 13 +++++-------- 2 files changed, 27 insertions(+), 8 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 4c53e70..67e9c4e 100644 --- a/tox.ini +++ b/tox.ini @@ -5,11 +5,10 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic2-cut/{env:BRANCH_NAME:} -envlist = coverage-dj111-pg +envlist = py{27,3}-coverage-dj111-pg [testenv] # django.contrib.auth is not tested it does not work with our templates -basepython = python2 setenv = AUTHENTIC2_SETTINGS_FILE=tests/settings.py DJANGO_SETTINGS_MODULE=authentic2.settings @@ -21,9 +20,6 @@ usedevelop = coverage: True nocoverage: False deps = - dj18: django>=1.8,<1.9 - dj18: django-tables2<1.1 - dj18: django-jsonfield<1.1 dj111: django>=1.11,<1.12 dj111: django-tables2>=1.1,<2 pg: psycopg2 @@ -44,9 +40,10 @@ deps = requests pytest-freezegun enum34<=1.1.6 + py27: django-appconf<1.0.4 http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz - http://git.entrouvert.org/authentic2-auth-fc.git/snapshot/authentic2-auth-fc-master.tar.gz commands = - ./getlasso.sh - dj18: ./pylint.sh src/authentic2_cut + py27: ./getlasso.sh + py3: ./getlasso3.sh + dj111: ./pylint.sh src/authentic2_cut py.test {env:FAST:} {env:COVERAGE:} {posargs:tests/}