diff --git a/tox.ini b/tox.ini index 8c25ff8..fca0f90 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:} -envlist = py2-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas},py3-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle},py3-django22-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle} +envlist = py3-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle},py3-django22-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle} [testenv] usedevelop = True @@ -46,11 +46,7 @@ deps: Markdown<3 django-tables2<2.0 authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz - py2-authentic: django-filter<2 - py3-authentic: django-filter<2.3 passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz - py2-passerelle: suds - py2-passerelle: pyrsistent<0.17 passerelle: python-memcached multitenant: systemd-python https://git.entrouvert.org/debian/django-tenant-schemas.git/snapshot/django-tenant-schemas-main.tar.gz @@ -60,11 +56,9 @@ deps: pytest-freezegun xmlschema<1.1 enum34<=1.1.6 - py2: django-appconf<1.0.4 psycopg2-binary commands = - py2: ./getlasso.sh - py3: ./getlasso3.sh + ./getlasso3.sh hobo: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/} schemas: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/} multitenant: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}