diff --git a/getlasso3.sh b/getlasso3.sh new file mode 100755 index 0000000..1ae0be6 --- /dev/null +++ b/getlasso3.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +# 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())'` + +if [ x"$DSTDIR" = x"$SRCDIR" ]; then + echo "Please use me inside a venv" + exit 1 +fi + +# 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 c81dfd4..c2b35e6 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,9 @@ # and then run "tox" from this directory. [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:} -envlist = coverage-{authentic,hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas}, +envlist = py2-coverage-{authentic,hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas}, py3-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas} [testenv] -basepython = python2 usedevelop = True setenv = BRANCH_NAME={env:BRANCH_NAME:} @@ -43,17 +42,19 @@ deps: django-tables2<2.0 authentic: http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz passerelle: http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz - passerelle: suds + py2-passerelle: suds passerelle: python-memcached multitenant: systemd-python http://git.entrouvert.org/debian/django-tenant-schemas.git/snapshot/django-tenant-schemas-master.tar.gz + mock httmock requests pytest-freezegun xmlschema<1.1 enum34<=1.1.6 commands = - ./getlasso.sh + py2: ./getlasso.sh + py3: ./getlasso3.sh hobo: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/} schemas: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/} multitenant: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}