klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-12-22 15:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #943 from ae-utbm/update-deps

Browse Source 
Update deps
This commit is contained in:
thomas girod 2024-12-08 13:46:53 +01:00 committed by GitHub
commit b2f54aa23e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 764 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -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.6.9 rev: v0.8.2
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

6
launderette/views.py
View File

@ -145,10 +145,8 @@ class LaunderetteBookView(CanViewMixin, DetailView):
and self.check_slot("WASHING", h) and self.check_slot("WASHING", h)
and self.check_slot("DRYING", h + timedelta(hours=1)) and self.check_slot("DRYING", h + timedelta(hours=1))
) )
or self.slot_type == "WASHING" or (self.slot_type == "WASHING" and self.check_slot("WASHING", h))
and self.check_slot("WASHING", h) or (self.slot_type == "DRYING" and self.check_slot("DRYING", h))
or self.slot_type == "DRYING"
and self.check_slot("DRYING", h)
): ):
free = True free = True
if free and datetime.now().replace(tzinfo=tz.utc) < h: if free and datetime.now().replace(tzinfo=tz.utc) < h:

1413
poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

61
pyproject.toml
View File

@ -23,39 +23,36 @@ license = "GPL-3.0-only"
python = "^3.12" python = "^3.12"
Django = "^4.2.14" Django = "^4.2.14"
django-ninja = "^1.3.0" django-ninja = "^1.3.0"
django-ninja-extra = "^0.21.4" django-ninja-extra = "^0.21.8"
Pillow = "^10.4.0" Pillow = "^11.0.0"
mistune = "^3.0.2" mistune = "^3.0.2"
django-jinja = "^2.11" django-jinja = "^2.11.0"
cryptography = "^43.0.0" cryptography = "^44.0.0"
django-phonenumber-field = "^8.0.0" django-phonenumber-field = "^8.0.0"
phonenumbers = "^8.13" phonenumbers = "^8.13.51"
reportlab = "^4.2" reportlab = "^4.2.5"
django-haystack = "^3.2.1" django-haystack = "^3.3.0"
xapian-haystack = "^3.0.1" xapian-haystack = "^3.1.0"
libsass = "^0.23" libsass = "^0.23.0"
django-ordered-model = "^3.7" django-ordered-model = "^3.7.4"
django-simple-captcha = "^0.6.0" django-simple-captcha = "^0.6.0"
python-dateutil = "^2.8.2" python-dateutil = "^2.9.0.post0"
sentry-sdk = "^2.16.0" sentry-sdk = "^2.19.2"
Jinja2 = "^3.1" Jinja2 = "^3.1.4"
django-countries = "^7.6.1" django-countries = "^7.6.1"
dict2xml = "^1.7.3" dict2xml = "^1.7.6"
Sphinx = "^5" # Needed for building xapian Sphinx = "^5" # Needed for building xapian
tomli = "^2.0.1" tomli = "^2.2.1"
django-honeypot = "^1.2.1" django-honeypot = "^1.2.1"
# When I introduced pydantic-extra-types, I needed *right now* pydantic-extra-types = "^2.10.1"
# the PhoneNumberValidator class which was on the master branch but not released yet.
# Once it's released, switch this to a regular version.
pydantic-extra-types = { git = "https://github.com/pydantic/pydantic-extra-types.git", rev = "58db4b0" }
[tool.poetry.group.prod.dependencies] [tool.poetry.group.prod.dependencies]
# deps used in prod, but unnecessary for development # deps used in prod, but unnecessary for development
# The C extra triggers compilation against sytem libs during install. # The C extra triggers compilation against sytem libs during install.
# Removing it would switch psycopg to a slower full-python implementation # Removing it would switch psycopg to a slower full-python implementation
psycopg = {extras = ["c"], version = "^3.2.1"} psycopg = {extras = ["c"], version = "^3.2.3"}
redis = {extras = ["hiredis"], version = "^5.0.8"} redis = {extras = ["hiredis"], version = "^5.2.0"}
[tool.poetry.group.prod] [tool.poetry.group.prod]
optional = true optional = true
@ -63,28 +60,28 @@ optional = true
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
# deps used for development purposes, but unneeded in prod # deps used for development purposes, but unneeded in prod
django-debug-toolbar = "^4.4.6" django-debug-toolbar = "^4.4.6"
ipython = "^8.26.0" ipython = "^8.30.0"
pre-commit = "^4.0.1" pre-commit = "^4.0.1"
ruff = "^0.6.9" # Version used in pipeline is controlled by pre-commit hooks in .pre-commit.config.yaml ruff = "^0.8.2" # Version used in pipeline is controlled by pre-commit hooks in .pre-commit.config.yaml
djhtml = "^3.0.6" djhtml = "^3.0.7"
faker = "^30.3.0" faker = "^33.1.0"
rjsmin = "^1.2.2" rjsmin = "^1.2.3"
[tool.poetry.group.tests.dependencies] [tool.poetry.group.tests.dependencies]
# deps used for testing purposes # deps used for testing purposes
freezegun = "^1.5.1" # used to test time-dependent code freezegun = "^1.5.1" # used to test time-dependent code
pytest = "^8.3.2" pytest = "^8.3.4"
pytest-cov = "^5.0.0" pytest-cov = "^6.0.0"
pytest-django = "^4.9.0" pytest-django = "^4.9.0"
model-bakery = "^1.20.0" model-bakery = "^1.20.0"
[tool.poetry.group.docs.dependencies] [tool.poetry.group.docs.dependencies]
# deps used to work on the documentation # deps used to work on the documentation
mkdocs = "^1.6.1" mkdocs = "^1.6.1"
mkdocs-material = "^9.5.40" mkdocs-material = "^9.5.47"
mkdocstrings = "^0.26.2" mkdocstrings = "^0.27.0"
mkdocstrings-python = "^1.12.0" mkdocstrings-python = "^1.12.2"
mkdocs-include-markdown-plugin = "^6.2.2" mkdocs-include-markdown-plugin = "^7.1.2"
[tool.poetry.group.docs] [tool.poetry.group.docs]
optional = true optional = true

5
sith/tests.py
View File

@ -26,7 +26,8 @@ def test_sentry_debug_endpoint(
expected_error: RaisesContext[ZeroDivisionError] | does_not_raise[None], expected_error: RaisesContext[ZeroDivisionError] | does_not_raise[None],
expected_return_code: int | None, expected_return_code: int | None,
): ):
with expected_error, override_settings( with (
SENTRY_DSN=sentry_dsn, SENTRY_ENV=sentry_env expected_error,
override_settings(SENTRY_DSN=sentry_dsn, SENTRY_ENV=sentry_env),
): ):
assert client.get(reverse("sentry-debug")).status_code == expected_return_code assert client.get(reverse("sentry-debug")).status_code == expected_return_code