Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependencies #278

Merged
merged 1 commit into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.12-slim

WORKDIR /app

Expand Down
1 change: 0 additions & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
db:
environment:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
db:
image: postgres:alpine
Expand Down
2 changes: 0 additions & 2 deletions ebau_gwr/token_proxy/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ def decrypt(self, value):
def from_db_value(self, value, *_):
if value is None:
return value
if hasattr(value, "tobytes"):
value = value.tobytes()
return self.decrypt(value)

def get_prep_value(self, value):
Expand Down
2 changes: 1 addition & 1 deletion ebau_gwr/token_proxy/tests/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ def test_fernet_password_field(db, settings, pw):
if pw is None:
assert row[0] is None
return
assert f.decrypt(row[0].tobytes()).decode() == pw
assert f.decrypt(row[0]).decode() == pw
898 changes: 320 additions & 578 deletions poetry.lock

Large diffs are not rendered by default.

21 changes: 7 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,27 @@ exclude = [

[tool.poetry.dependencies]
python = ">=3.10.0,<4"
cryptography = ">=37.0.2,<43.0.0"
Django = "^4.2.13"
cryptography = ">=37.0.2,<44.0.0"
Django = "^4.2.15"
django-environ = ">=0.10,<0.12"
django-filter = ">=23.5,<25"
django-generic-api-permissions = "^0.4.1"
djangorestframework = "^3.14.0"
djangorestframework-jsonapi = ">=5,<8"
mozilla-django-oidc = ">=2,<5"
psycopg2-binary = "^2.9.9"
psycopg = "^3.2.1"
requests = "^2.31.0"
uWSGI = "^2.0.23"

[tool.poetry.group.dev.dependencies]
black = "24.4.2"
django-extensions = "3.2.3"
factory-boy = "3.3.0"
flake8 = "7.0.0"
flake8-blind-except = "0.2.1"
flake8-debugger = "4.1.2"
flake8-docstrings = "1.7.0"
flake8-isort = "6.1.1"
flake8-string-format = "0.3.0"
flake8-tuple = "0.4.1"
gitlint = "0.19.1"
ipython = "8.26.0"
isort = "5.13.2"
pdbpp = "0.10.3"
pre-commit = "3.7.1"
pytest = "8.2.2"
pre-commit = "3.8.0"
pytest = "8.3.2"
pytest-cov = "5.0.0"
pytest-django = "4.8.0"
pytest-env = "1.1.3"
Expand All @@ -62,7 +54,7 @@ pytest-randomly = "3.15.0"
python-semantic-release = "7.33.3"
requests-mock = "1.12.1"
syrupy = "4.6.1"
ruff = "^0.5.1"
ruff = "0.5.7"

[tool.ruff.lint]
extend-select = ["I"]
Expand All @@ -77,6 +69,7 @@ DJANGO_SETTINGS_MODULE = "ebau_gwr.settings"
filterwarnings = [
"error::DeprecationWarning",
"error::PendingDeprecationWarning",
"ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography.:DeprecationWarning", # deprecation in mozilla-django-oidc
]
env = [
"ADMINS=Test Example <[email protected]>,Test2 <[email protected]>",
Expand Down