Skip to content

Commit

Permalink
Merge pull request #97 from openzim/deps
Browse files Browse the repository at this point in the history
updated all dependencies
  • Loading branch information
rgaudin authored Sep 23, 2024
2 parents b1d4c32 + 5f603ea commit e92971b
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 57 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/PublishDockerImages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:

jobs:
api:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build and push Docker image
uses: openzim/docker-publish-action@v10
with:
Expand All @@ -27,9 +27,9 @@ jobs:
repo_overview: auto

frontend:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build and push Docker image
uses: openzim/docker-publish-action@v10
with:
Expand All @@ -48,7 +48,7 @@ jobs:

deploy:
needs: [api,frontend]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Restart live webapp
uses: actions-hub/kubectl@master
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/QA-Backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:

jobs:
check-backend-qa:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version-file: 'backend/pyproject.toml'
architecture: x64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/QA-Frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:

jobs:
check-frontend-qa:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: 'frontend/.nvmrc'
architecture: x64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
run-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
services:
postgres:
image: postgres:15.3-bullseye
Expand All @@ -26,10 +26,10 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version-file: "backend/pyproject.toml"
architecture: x64
Expand Down
48 changes: 24 additions & 24 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files

- repo: https://github.com/pycqa/isort
rev: "5.12.0"
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]

- repo: https://github.com/psf/black
rev: "23.3.0"
hooks:
- id: black

- repo: https://github.com/pycqa/flake8
rev: "6.0.0"
hooks:
- id: flake8
args: ["--max-line-length", "88", "--extend-ignore=E203"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/psf/black
rev: "24.8.0"
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.5
hooks:
- id: ruff
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.380
hooks:
- id: pyright
name: pyright (system)
description: 'pyright static type checker'
entry: pyright
language: system
'types_or': [python, pyi]
require_serial: true
minimum_pre_commit_version: '2.9.2'
3 changes: 2 additions & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ ENV RUN_DB_MIGRATIONS ""
VOLUME [ "/storage" ]

RUN apt-get update -y \
&& apt-get install -y --no-install-recommends libmagic1 \
&& apt-get install -y libcairo2 libmagic1 libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev libxcb1-dev gifsicle \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
COPY pyproject.toml README.md tasks.py entrypoint.sh /app/
Expand Down
37 changes: 19 additions & 18 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ classifiers = [
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
]
dependencies = [
"fastapi==0.111.0",
"uvicorn[standard]==0.29.0",
"httpx==0.27.0",
"SQLAlchemy==2.0.30",
"alembic==1.13.1",
"psycopg[binary,pool]==3.1.18",
"pymongo==4.7.1",
"fastapi[standard]==0.114.2",
"uvicorn[standard]==0.29.0",#30.6
"httpx==0.27.2",
"SQLAlchemy==2.0.35",
"alembic==1.13.2",
"psycopg[binary,pool]==3.2.2",
"pymongo==4.8.0",
"python-dateutil==2.9.0.post0",
"kiwixstorage==0.9.0",
"python-multipart==0.0.9",
"zimscraperlib==3.3.2",
"zimscraperlib==4.0.0",
"humanfriendly==10.0",
"rq==1.16.2",
"werkzeug==3.0.3",
"werkzeug==3.0.4",
"webdav4==0.10.0",
]
dynamic = ["authors", "license", "version", "urls"]

Expand All @@ -36,22 +37,22 @@ scripts = [
"invoke==2.2.0",
]
lint = [
"black==24.4.2",
"ruff==0.4.3",
"black==24.8.0",
"ruff==0.6.5",
]
check = [
"pyright==1.1.367",
"pytest == 8.2.0", # import pytest in tests
"pyright==1.1.380",
"pytest == 8.3.3", # import pytest in tests
]
test = [
"pytest==8.2.0",
"coverage==7.5.1",
"pytest==8.3.3",
"coverage==7.6.1",
"pytest-mock==3.14.0",
"trio == 0.25.1"
"trio == 0.26.2"
]
dev = [
"ipython==8.25.0",
"pre-commit==3.7.0",
"ipython==8.27.0",
"pre-commit==3.8.0",
"nautilus-api[scripts]",
"nautilus-api[lint]",
"nautilus-api[test]",
Expand Down

0 comments on commit e92971b

Please sign in to comment.