mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Merge branch 'mypy-from-debian' into 'master'
gitlab-ci: use mypy from Debian/bullseye to prevent random breakage See merge request fdroid/fdroidserver!952
This commit is contained in:
commit
86b053291d
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
variables:
|
variables:
|
||||||
pip: pip3 --timeout 100 --retries 10
|
pip: pip3 --timeout 100 --retries 10
|
||||||
# speed up git checkout phase
|
# speed up git checkout phase
|
||||||
GIT_DEPTH: 1
|
GIT_DEPTH: 1
|
||||||
|
|
||||||
|
|
||||||
@ -133,7 +133,7 @@ ubuntu_bionic_pip:
|
|||||||
- deactivate
|
- deactivate
|
||||||
- tar tzf dist/fdroidserver-*.tar.gz | grep locale/de/LC_MESSAGES/fdroidserver.mo
|
- tar tzf dist/fdroidserver-*.tar.gz | grep locale/de/LC_MESSAGES/fdroidserver.mo
|
||||||
# back to bare machine to act as user's install machine
|
# back to bare machine to act as user's install machine
|
||||||
- $pip install --upgrade pip setuptools wheel # make this go away: "error: invalid command 'bdist_wheel'"
|
- $pip install --upgrade pip setuptools wheel # make this go away: "error: invalid command 'bdist_wheel'"
|
||||||
- $pip install dist/fdroidserver-*.tar.gz
|
- $pip install dist/fdroidserver-*.tar.gz
|
||||||
- tar xzf dist/fdroidserver-*.tar.gz
|
- tar xzf dist/fdroidserver-*.tar.gz
|
||||||
- cd fdroidserver-*
|
- cd fdroidserver-*
|
||||||
@ -202,9 +202,16 @@ lint_format_safety_bandit_checks:
|
|||||||
|
|
||||||
|
|
||||||
lint_mypy:
|
lint_mypy:
|
||||||
image: python:3.9-buster
|
image: debian:bullseye
|
||||||
|
<<: *apt-template
|
||||||
script:
|
script:
|
||||||
- pip install mypy
|
- sed -i '/pyjks/d' setup.py # TODO get from backports once available
|
||||||
|
# use Debian packages to avoid building C/rust sources
|
||||||
|
- apt-get install
|
||||||
|
mypy
|
||||||
|
python3-cryptography
|
||||||
|
python3-pip
|
||||||
|
python3-wheel
|
||||||
- pip install -e .[test]
|
- pip install -e .[test]
|
||||||
# exclude vendored file
|
# exclude vendored file
|
||||||
- mypy --exclude fdroidserver/apksigcopier.py
|
- mypy --exclude fdroidserver/apksigcopier.py
|
||||||
@ -360,7 +367,7 @@ plugin_fetchsrclibs:
|
|||||||
- . env/bin/activate
|
- . env/bin/activate
|
||||||
- export PATH="$CI_PROJECT_DIR:$PATH"
|
- export PATH="$CI_PROJECT_DIR:$PATH"
|
||||||
- export PYTHONPATH="$CI_PROJECT_DIR/examples"
|
- export PYTHONPATH="$CI_PROJECT_DIR/examples"
|
||||||
- $pip install wheel # to make this go away: "error: invalid command 'bdist_wheel'"
|
- $pip install wheel # to make this go away: "error: invalid command 'bdist_wheel'"
|
||||||
- $pip install -e .
|
- $pip install -e .
|
||||||
- fdroid | grep fetchsrclibs
|
- fdroid | grep fetchsrclibs
|
||||||
|
|
||||||
@ -427,14 +434,15 @@ Build documentation:
|
|||||||
paths:
|
paths:
|
||||||
- docs/build/html/
|
- docs/build/html/
|
||||||
|
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
image: alpine:latest
|
image: alpine:latest
|
||||||
stage: deploy
|
stage: deploy
|
||||||
script:
|
script:
|
||||||
- cp docs/build/html public -r # GL Pages needs the files in a directory named "public"
|
- cp docs/build/html public -r # GL Pages needs the files in a directory named "public"
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
needs: ["Build documentation"]
|
needs: ["Build documentation"]
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # only publish pages on default (master) branch
|
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # only publish pages on default (master) branch
|
||||||
|
Loading…
Reference in New Issue
Block a user