diff --git a/Jenkinsfile b/Jenkinsfile index 362c100..4600c49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,9 +23,9 @@ pipeline { steps { script { if (env.JOB_NAME == 'fargo' && env.GIT_BRANCH == 'origin/main') { - sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d buster,bullseye fargo' + sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye fargo' } else if (env.GIT_BRANCH.startsWith('hotfix/')) { - sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d buster,bullseye --branch ${env.GIT_BRANCH} --hotfix fargo" + sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye --branch ${env.GIT_BRANCH} --hotfix fargo" } } } diff --git a/tox.ini b/tox.ini index 5c103ab..b6bc512 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/fargo/{env:BRANCH_NAME:} envlist = - py3-dj32-bullseye-black-coverage-pylint - py3-dj22-buster + py3-dj32-black-coverage-pylint + py3-dj22 [testenv] usedevelop = True @@ -21,11 +21,8 @@ deps = pylint-django dj22: django>=2.2,<2.3 dj32: django>=3.2,<3.3 - buster: django-filter>=2.1,<2.2 - buster: django-tables2==1.21.1 - buster: djangorestframework>=3.9.2,<3.10 - bullseye: django-filter>=2.4,<2.5 - bullseye: django-tables2==2.4.1 + django-filter>=2.4,<2.5 + django-tables2==2.4.1 pytest-cov pytest-random pytest-mock