mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-10 00:03:24 +00:00
Merge pull request #808 from ae-utbm/update
Update Python and dependencies
This commit is contained in:
commit
6380fb193c
6
.github/actions/setup_project/action.yml
vendored
6
.github/actions/setup_project/action.yml
vendored
@ -16,16 +16,16 @@ runs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Set up python
|
- name: Set up python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "3.10"
|
python-version: "3.12"
|
||||||
|
|
||||||
- name: Load cached Poetry installation
|
- name: Load cached Poetry installation
|
||||||
id: cached-poetry
|
id: cached-poetry
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: ~/.local
|
path: ~/.local
|
||||||
key: poetry-0 # increment to reset cache
|
key: poetry-1 # increment to reset cache
|
||||||
|
|
||||||
- name: Install Poetry
|
- name: Install Poetry
|
||||||
if: steps.cached-poetry.outputs.cache-hit != 'true'
|
if: steps.cached-poetry.outputs.cache-hit != 'true'
|
||||||
|
3
.github/workflows/deploy.yml
vendored
3
.github/workflows/deploy.yml
vendored
@ -36,7 +36,8 @@ jobs:
|
|||||||
export PATH="/home/sith/.local/bin:$PATH"
|
export PATH="/home/sith/.local/bin:$PATH"
|
||||||
pushd ${{secrets.SITH_PATH}}
|
pushd ${{secrets.SITH_PATH}}
|
||||||
|
|
||||||
git pull
|
git fetch
|
||||||
|
git reset --hard origin/master
|
||||||
poetry install --with prod --without docs,tests
|
poetry install --with prod --without docs,tests
|
||||||
poetry run ./manage.py install_xapian
|
poetry run ./manage.py install_xapian
|
||||||
poetry run ./manage.py migrate
|
poetry run ./manage.py migrate
|
||||||
|
2
.github/workflows/deploy_docs.yml
vendored
2
.github/workflows/deploy_docs.yml
vendored
@ -9,7 +9,7 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: ./.github/actions/setup_project
|
- uses: ./.github/actions/setup_project
|
||||||
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
|
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v3
|
||||||
|
3
.github/workflows/taiste.yml
vendored
3
.github/workflows/taiste.yml
vendored
@ -35,7 +35,8 @@ jobs:
|
|||||||
export PATH="$HOME/.poetry/bin:$PATH"
|
export PATH="$HOME/.poetry/bin:$PATH"
|
||||||
pushd ${{secrets.SITH_PATH}}
|
pushd ${{secrets.SITH_PATH}}
|
||||||
|
|
||||||
git pull
|
git fetch
|
||||||
|
git reset --hard origin/taiste
|
||||||
poetry install --with prod --without docs,tests
|
poetry install --with prod --without docs,tests
|
||||||
poetry run ./manage.py install_xapian
|
poetry run ./manage.py install_xapian
|
||||||
poetry run ./manage.py migrate
|
poetry run ./manage.py migrate
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
# Ruff version.
|
# Ruff version.
|
||||||
rev: v0.5.5
|
rev: v0.5.7
|
||||||
hooks:
|
hooks:
|
||||||
- id: ruff # just check the code, and print the errors
|
- id: ruff # just check the code, and print the errors
|
||||||
- id: ruff # actually fix the fixable errors, but print nothing
|
- id: ruff # actually fix the fixable errors, but print nothing
|
||||||
|
@ -23,6 +23,8 @@
|
|||||||
#
|
#
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Self
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import validators
|
from django.core import validators
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
@ -265,12 +267,11 @@ class Club(models.Model):
|
|||||||
|
|
||||||
|
|
||||||
class MembershipQuerySet(models.QuerySet):
|
class MembershipQuerySet(models.QuerySet):
|
||||||
def ongoing(self) -> "MembershipQuerySet":
|
def ongoing(self) -> Self:
|
||||||
"""Filter all memberships which are not finished yet."""
|
"""Filter all memberships which are not finished yet."""
|
||||||
# noinspection PyTypeChecker
|
|
||||||
return self.filter(Q(end_date=None) | Q(end_date__gte=timezone.now()))
|
return self.filter(Q(end_date=None) | Q(end_date__gte=timezone.now()))
|
||||||
|
|
||||||
def board(self) -> "MembershipQuerySet":
|
def board(self) -> Self:
|
||||||
"""Filter all memberships where the user is/was in the board.
|
"""Filter all memberships where the user is/was in the board.
|
||||||
|
|
||||||
Be aware that users who were in the board in the past
|
Be aware that users who were in the board in the past
|
||||||
@ -279,7 +280,6 @@ class MembershipQuerySet(models.QuerySet):
|
|||||||
If you want to get the users who are currently in the board,
|
If you want to get the users who are currently in the board,
|
||||||
mind combining this with the :meth:`ongoing` queryset method
|
mind combining this with the :meth:`ongoing` queryset method
|
||||||
"""
|
"""
|
||||||
# noinspection PyTypeChecker
|
|
||||||
return self.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
|
return self.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
|
||||||
|
|
||||||
def update(self, **kwargs):
|
def update(self, **kwargs):
|
||||||
|
@ -362,7 +362,6 @@ class CounterQuerySet(models.QuerySet):
|
|||||||
```
|
```
|
||||||
"""
|
"""
|
||||||
subquery = user.counters.filter(pk=OuterRef("pk"))
|
subquery = user.counters.filter(pk=OuterRef("pk"))
|
||||||
# noinspection PyTypeChecker
|
|
||||||
return self.annotate(has_annotated_barman=Exists(subquery))
|
return self.annotate(has_annotated_barman=Exists(subquery))
|
||||||
|
|
||||||
|
|
||||||
|
713
poetry.lock
generated
713
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -20,10 +20,10 @@ homepage = "https://ae.utbm.fr/"
|
|||||||
license = "GPL-3.0-only"
|
license = "GPL-3.0-only"
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.10"
|
python = "^3.12"
|
||||||
Django = "^4.2.14"
|
Django = "^4.2.14"
|
||||||
django-ninja = "^1.2.2"
|
django-ninja = "^1.3.0"
|
||||||
django-ninja-extra = "^0.21.2"
|
django-ninja-extra = "^0.21.4"
|
||||||
Pillow = "^10.4.0"
|
Pillow = "^10.4.0"
|
||||||
mistune = "^3.0.2"
|
mistune = "^3.0.2"
|
||||||
django-jinja = "^2.11"
|
django-jinja = "^2.11"
|
||||||
@ -63,7 +63,7 @@ optional = true
|
|||||||
django-debug-toolbar = "^4.4.6"
|
django-debug-toolbar = "^4.4.6"
|
||||||
ipython = "^8.26.0"
|
ipython = "^8.26.0"
|
||||||
pre-commit = "^3.8.0"
|
pre-commit = "^3.8.0"
|
||||||
ruff = "^0.5.5" # Version used in pipeline is controlled by pre-commit hooks in .pre-commit.config.yaml
|
ruff = "^0.5.7" # Version used in pipeline is controlled by pre-commit hooks in .pre-commit.config.yaml
|
||||||
djhtml = "^3.0.6"
|
djhtml = "^3.0.6"
|
||||||
faker = "^26.1.0"
|
faker = "^26.1.0"
|
||||||
rjsmin = "^1.2.2"
|
rjsmin = "^1.2.2"
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
from typing import Self
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
@ -61,7 +62,7 @@ class SasFile(SithFile):
|
|||||||
|
|
||||||
|
|
||||||
class PictureQuerySet(models.QuerySet):
|
class PictureQuerySet(models.QuerySet):
|
||||||
def viewable_by(self, user: User) -> PictureQuerySet:
|
def viewable_by(self, user: User) -> Self:
|
||||||
"""Filter the pictures that this user can view.
|
"""Filter the pictures that this user can view.
|
||||||
|
|
||||||
Warnings:
|
Warnings:
|
||||||
@ -173,7 +174,7 @@ class Picture(SasFile):
|
|||||||
|
|
||||||
|
|
||||||
class AlbumQuerySet(models.QuerySet):
|
class AlbumQuerySet(models.QuerySet):
|
||||||
def viewable_by(self, user: User) -> PictureQuerySet:
|
def viewable_by(self, user: User) -> Self:
|
||||||
"""Filter the albums that this user can view.
|
"""Filter the albums that this user can view.
|
||||||
|
|
||||||
Warnings:
|
Warnings:
|
||||||
|
Loading…
Reference in New Issue
Block a user