Skip to content

Commit

Permalink
test with python 3.9 and 3.10 + build with python 3.8 instead of 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ziirish committed Oct 6, 2021
1 parent 10169e4 commit 6689227
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 4 deletions.
64 changes: 62 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ test:lint:3.7:
- lint
except:
- tags
- rc
- demo

test:lint:3.8:
stage: test
Expand All @@ -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

Expand Down Expand Up @@ -90,6 +116,8 @@ test:py:3.7:
- docker
except:
- tags
- rc
- demo
artifacts:
reports:
junit: .reports/burpui.junit.xml
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,37,38}
envlist = py{36,37,38,39,310}

[testenv]
description = Run burp-ui unit tests
Expand Down

0 comments on commit 6689227

Please sign in to comment.