hexware/fastapi-dls
1
0
Fork 0
mirror of https://git.collinwebdesigns.de/oscar.krause/fastapi-dls.git synced 2024-11-23 23:41:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
requirements.txt updated

See merge request oscar.krause/fastapi-dls!36
This commit is contained in:
Oscar Krause 2024-11-13 14:09:54 +01:00
commit f2be9dca8d
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.DEBIAN/requirements-ubuntu-24.10.txt Normal file
View File

@ -0,0 +1,10 @@
# https://packages.ubuntu.com
fastapi==0.110.3
uvicorn[standard]==0.30.3
python-jose[pycryptodome]==3.3.0
pycryptodome==3.20.0
python-dateutil==2.9.0
sqlalchemy==2.0.32
markdown==3.6
python-dotenv==1.0.1
jinja2==3.1.3

35
.gitlab-ci.yml
View File

@ -141,14 +141,21 @@ test:
DATABASE: sqlite:///../app/db.sqlite DATABASE: sqlite:///../app/db.sqlite
parallel: parallel:
matrix: matrix:
- IMAGE: [ 'python:3.11-slim-bookworm', 'python:3.12-slim-bullseye' ] - IMAGE: [ 'python:3.12-slim-bookworm' ]
REQUIREMENTS: REQUIREMENTS: [ 'requirements.txt' ]
- requirements.txt - IMAGE: [ 'debian:bookworm' ]
- .DEBIAN/requirements-bookworm-12.txt REQUIREMENTS: [ '.DEBIAN/requirements-bookworm-12.txt' ]
- .DEBIAN/requirements-ubuntu-23.10.txt - IMAGE: [ 'ubuntu:23.10' ]
- .DEBIAN/requirements-ubuntu-24.04.txt REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-23.10.txt' ]
- IMAGE: [ 'ubuntu:24.04' ]
REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-24.04.txt' ]
- IMAGE: [ 'ubuntu:24.10' ]
REQUIREMENTS: [ '.DEBIAN/requirements-ubuntu-24.10.txt' ]
before_script: before_script:
- apt-get update && apt-get install -y python3-dev gcc - apt-get update && apt-get install -y python3-dev python3-pip python3-venv gcc
- python3 -m venv venv
- source venv/bin/activate
- pip install --upgrade pip
- pip install -r $REQUIREMENTS - pip install -r $REQUIREMENTS
- pip install pytest httpx - pip install pytest httpx
- mkdir -p app/cert - mkdir -p app/cert
@ -162,7 +169,7 @@ test:
dotenv: version.env dotenv: version.env
junit: ['**/report.xml'] junit: ['**/report.xml']
.test:linux: .test:apt:
stage: test stage: test
rules: rules:
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
@ -201,15 +208,15 @@ test:
- apt-get purge -qq -y fastapi-dls - apt-get purge -qq -y fastapi-dls
- apt-get autoremove -qq -y && apt-get clean -qq - apt-get autoremove -qq -y && apt-get clean -qq
test:debian: test:apt:debian:
extends: .test:linux extends: .test:apt
image: debian:bookworm-slim image: debian:bookworm-slim
test:ubuntu: test:apt:ubuntu:
extends: .test:linux extends: .test:apt
image: ubuntu:24.04 image: ubuntu:24.04
test:archlinux: test:pacman:archlinux:
image: archlinux:base image: archlinux:base
rules: rules:
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
@ -250,7 +257,7 @@ semgrep-sast:
test_coverage: test_coverage:
# extends: test # extends: test
image: python:3.11-slim-bookworm image: python:3.12-slim-bookworm
allow_failure: true allow_failure: true
stage: test stage: test
rules: rules:

2
Dockerfile
View File

@ -10,7 +10,7 @@ RUN apk update \
&& apk add --no-cache --virtual build-deps gcc g++ python3-dev musl-dev pkgconfig \ && apk add --no-cache --virtual build-deps gcc g++ python3-dev musl-dev pkgconfig \
&& apk add --no-cache curl postgresql postgresql-dev mariadb-dev sqlite-dev \ && apk add --no-cache curl postgresql postgresql-dev mariadb-dev sqlite-dev \
&& pip install --no-cache-dir --upgrade uvicorn \ && pip install --no-cache-dir --upgrade uvicorn \
&& pip install --no-cache-dir psycopg2==2.9.9 mysqlclient==2.2.4 pysqlite3==0.5.2 \ && pip install --no-cache-dir psycopg2==2.9.10 mysqlclient==2.2.6 pysqlite3==0.5.4 \
&& pip install --no-cache-dir -r /tmp/requirements.txt \ && pip install --no-cache-dir -r /tmp/requirements.txt \
&& apk del build-deps && apk del build-deps

2
requirements.txt
View File

@ -1,4 +1,4 @@
fastapi==0.115.3 fastapi==0.115.5
uvicorn[standard]==0.32.0 uvicorn[standard]==0.32.0
python-jose==3.3.0 python-jose==3.3.0
pycryptodome==3.21.0 pycryptodome==3.21.0