From 4650f3fcb03144bd231285c25f7e54070fb491b7 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 2 Jul 2021 08:55:03 +0200 Subject: [PATCH] tox.ini: do not run environments with Django 1.11 --- Jenkinsfile | 2 +- tox.ini | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 407e166e5..86c42984c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { sh """ python3 -m venv ${env.TMPDIR}/venv/ ${env.TMPDIR}/venv/bin/pip install tox -PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv -e code-style,rbac-py3-dj111,authentic-py3-dj111-drf39,authentic-py3-dj22-drf39,pylint""" +PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv -e code-style,authentic-py3-dj22-drf39,pylint""" } post { always { diff --git a/tox.ini b/tox.ini index af90ed99b..5731faa21 100644 --- a/tox.ini +++ b/tox.ini @@ -7,16 +7,13 @@ toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/ envlist = code-style - authentic-py3-dj111-drf39 authentic-py3-dj22-drf39 [tox:jenkins] envlist = pylint - rbac-py3-dj111 rbac-py3-dj22 - authentic-py3-dj111-drf39 authentic-py3-dj22-drf39 [testenv]