Commit 43942fd9 authored by juga's avatar juga
Browse files

fix: CI: Update Python default version to 3.9

Also:
- remove redundant image variable
- build docs with python 3.9 too
- Add python 3.9 as target-version for black
parent 4d28ff6a
......@@ -15,7 +15,7 @@
# 3.6 EOL 2021-12-23 PEP 494
variables:
BASE_IMAGE: python:3.8
BASE_IMAGE: python:3.9
RELEASE: tor-nightly-main-bullseye
# Without version, the default available in the Debian repository will be
# installed.
......@@ -49,7 +49,6 @@ after_script:
python36:
variables:
BASE_IMAGE: python:3.6
image: $BASE_IMAGE
script:
- tox -e py36
- tox -e integration
......@@ -57,67 +56,59 @@ python36:
python37:
variables:
BASE_IMAGE: python:3.7
image: $BASE_IMAGE
script:
- tox -e py37
- tox -e integration
python38:
# This will overwrite the default before_script, so need to repeat the
# commands
before_script:
- "wget https://deb.torproject.org/torproject.org/\
A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc"
- cat A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | apt-key add -
- echo deb [signed-by=A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89]
http://deb.torproject.org/torproject.org $RELEASE
main >> /etc/apt/sources.list
- apt update -yqq
- apt install -yqq $TOR
- pip install tox
- python --version
- tor --version
# To build the docs
- apt install -yqq texlive-latex-extra
- apt install -yqq dvipng
image: $BASE_IMAGE
variables:
BASE_IMAGE: python:3.8
script:
- tox
- tox -e py38
- tox -e integration
python39tor045:
variables:
BASE_IMAGE: python:3.9
RELEASE: tor-nightly-0.4.5.x-bullseye
TOR: tor/tor-nightly-0.4.5.x-bullseye
image: $BASE_IMAGE
script:
- tox -e py39
- tox -e integration
python39tor046:
variables:
BASE_IMAGE: python:3.9
RELEASE: tor-nightly-0.4.6.x-bullseye
TOR: tor/tor-nightly-0.4.6.x-bullseye
image: $BASE_IMAGE
script:
- tox -e py39
- tox -e integration
python39tormaster:
variables:
BASE_IMAGE: python:3.9
image: $BASE_IMAGE
# This will overwrite the default before_script, so need to repeat the
# commands
before_script:
- "wget https://deb.torproject.org/torproject.org/\
A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc"
- cat A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | apt-key add -
- echo deb [signed-by=A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89]
http://deb.torproject.org/torproject.org $RELEASE
main >> /etc/apt/sources.list
- apt update -yqq
- apt install -yqq $TOR
- pip install tox
- python --version
- tor --version
# To build the docs
- apt install -yqq texlive-latex-extra
- apt install -yqq dvipng
script:
- tox -e py39
- tox -e integration
- tox
python39torstable:
variables:
BASE_IMAGE: python:3.9
RELEASE: bullseye
TOR: tor/bullseye
image: $BASE_IMAGE
script:
- tox -e py39
- tox -e integration
......@@ -125,7 +116,6 @@ python39torstable:
python310:
variables:
BASE_IMAGE: python:3.10-rc-bullseye
image: $BASE_IMAGE
script:
- tox -e py310
- tox -e integration
......
[tool.black]
line-length = 79
target-version = ['py36', 'py37', 'py38']
target-version = ['py36', 'py37', 'py38', 'py39']
exclude = '''
/(
docs
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment