From 668922753d97f0a71844d6985d9b8b2695fb2421 Mon Sep 17 00:00:00 2001
From: ziirish <ziirish@ziirish.info>
Date: Wed, 6 Oct 2021 17:34:16 +0200
Subject: [PATCH] test with python 3.9 and 3.10 + build with python 3.8 instead
 of 3.7

---
 .gitlab-ci.yml    | 64 +++++++++++++++++++++++++++++++++++++++++++++--
 docker/Dockerfile |  2 +-
 tox.ini           |  2 +-
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 544f80c8..05731b31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,6 +48,8 @@ test:lint:3.7:
   - lint
   except:
   - tags
+  - rc
+  - demo
 
 test:lint:3.8:
   stage: test
@@ -59,6 +61,30 @@ test:lint:3.8:
   - lint
   except:
   - tags
+
+test:lint:3.9:
+  stage: test
+  image: python:3.9
+  script:
+  - pip install tox
+  - tox -e pep8
+  tags:
+  - lint
+  except:
+  - tags
+  - rc
+  - demo
+
+test:lint:3.10:
+  stage: test
+  image: python:3.10
+  script:
+  - pip install tox
+  - tox -e pep8
+  tags:
+  - lint
+  except:
+  - tags
   - rc
   - demo
 
@@ -90,6 +116,8 @@ test:py:3.7:
   - docker
   except:
   - tags
+  - rc
+  - demo
   artifacts:
     reports:
       junit: .reports/burpui.junit.xml
@@ -105,6 +133,38 @@ test:py:3.8:
   - docker
   except:
   - tags
+  artifacts:
+    reports:
+      junit: .reports/burpui.junit.xml
+
+test:py:3.9:
+  stage: test
+  image: python:3.9
+  script:
+  - pip install tox
+  - mkdir .reports
+  - tox -e py39
+  tags:
+  - docker
+  except:
+  - tags
+  - rc
+  - demo
+  artifacts:
+    reports:
+      junit: .reports/burpui.junit.xml
+
+test:py:3.10:
+  stage: test
+  image: python:3.10
+  script:
+  - pip install tox
+  - mkdir .reports
+  - tox -e py310
+  tags:
+  - docker
+  except:
+  - tags
   - rc
   - demo
   artifacts:
@@ -113,7 +173,7 @@ test:py:3.8:
 
 build:py3:
   stage: build
-  image: python:3.7
+  image: python:3.8
   script:
   - tests/build.sh
   tags:
@@ -130,7 +190,7 @@ build:py3:
 
 build:doc:
   stage: build
-  image: python:3.7
+  image: python:3.8
   script:
   - pip install -U .[rtd]
   - cd docs && make html
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 428f6739..b3cb346d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.12
+FROM python:3.8-alpine
 
 RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata nginx \
 	&& apk add --no-cache --virtual .fetch-deps \
diff --git a/tox.ini b/tox.ini
index 316c4358..446c0a68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}
+envlist = py{36,37,38,39,310}
 
 [testenv]
 description = Run burp-ui unit tests