Skip to content

Commit

Permalink
upgraded deps (#121)
Browse files Browse the repository at this point in the history
* upgraded deps

* pydantic fix after upgrade
  • Loading branch information
fzumstein authored Sep 11, 2024
1 parent 07e0662 commit 1fbfb72
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 79 deletions.
8 changes: 4 additions & 4 deletions app/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
from pathlib import Path
from typing import Literal, Optional
from typing import List, Literal, Optional

from pydantic import UUID4, computed_field
from pydantic_settings import BaseSettings, SettingsConfigDict
Expand All @@ -13,8 +13,8 @@ class Settings(BaseSettings):
env_prefix="XLWINGS_", env_file=os.getenv("DOTENV_PATH", ".env"), extra="ignore"
)
add_security_headers: bool = True
auth_providers: Optional[list[str]] = []
auth_required_roles: Optional[list[str]] = []
auth_providers: Optional[List[str]] = []
auth_required_roles: Optional[List[str]] = []
auth_entraid_client_id: Optional[str] = None
auth_entraid_tenant_id: Optional[str] = None
auth_entraid_multitenant: bool = False
Expand All @@ -23,7 +23,7 @@ class Settings(BaseSettings):
object_cache_url: Optional[str] = None
object_cache_expire_at: Optional[str] = "0 12 * * sat"
object_cache_enable_compression: bool = True
cors_allow_origins: list[str] = ["*"]
cors_allow_origins: List[str] = ["*"]
date_format: Optional[str] = None
enable_alpinejs_csp: bool = True
enable_bootstrap: bool = True
Expand Down
11 changes: 7 additions & 4 deletions app/static/vendor/htmx-ext-head-support/head-support.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@
api = apiRef;

htmx.on('htmx:afterSwap', function(evt){
var serverResponse = evt.detail.xhr.response;
if (api.triggerEvent(document.body, "htmx:beforeHeadMerge", evt.detail)) {
mergeHead(serverResponse, evt.detail.boosted ? "merge" : "append");
let xhr = evt.detail.xhr;
if (xhr) {
var serverResponse = xhr.response;
if (api.triggerEvent(document.body, "htmx:beforeHeadMerge", evt.detail)) {
mergeHead(serverResponse, evt.detail.boosted ? "merge" : "append");
}
}
})

Expand All @@ -138,4 +141,4 @@
}
});

})()
})()
2 changes: 1 addition & 1 deletion app/static/vendor/xlwings/xlwingsjs/dist/xlwings.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"@microsoft/office-js": "1.1.93",
"bootstrap": "5.3.3",
"bootstrap-xlwings": "github:xlwings/bootstrap-xlwings#5.3.3-1",
"htmx-ext-head-support": "2.0.1",
"htmx-ext-head-support": "2.0.2",
"htmx-ext-loading-states": "2.0.0",
"htmx.org": "2.0.2",
"socket.io": "4.7.5",
"xlwings": "github:xlwings/xlwings#0.32.1"
"xlwings": "github:xlwings/xlwings#0.32.2"
},
"devDependencies": {
"@types/alpinejs": "3.13.10",
"prettier": "3.3.3",
"prettier-plugin-jinja-template": "1.4.1"
"prettier-plugin-jinja-template": "1.5.0"
}
}
26 changes: 13 additions & 13 deletions requirements-core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ anyio==4.4.0
# starlette
bidict==0.23.1
# via python-socketio
certifi==2024.7.4
certifi==2024.8.30
# via
# httpcore
# httpx
cffi==1.17.0 ; platform_python_implementation != 'PyPy'
cffi==1.17.1 ; platform_python_implementation != 'PyPy'
# via cryptography
click==8.1.7
# via uvicorn
colorama==0.4.6 ; platform_system == 'Windows'
# via click
croniter==3.0.3
# via -r requirements-core.in
cryptography==43.0.0
cryptography==43.0.1
# via joserfc
fastapi-slim==0.112.1
fastapi-slim==0.114.1
# via -r requirements-core.in
gunicorn==23.0.0 ; sys_platform != 'win32'
# via -r requirements-core.in
Expand All @@ -39,9 +39,9 @@ httpcore==1.0.5
# via httpx
httptools==0.6.1
# via -r requirements-core.in
httpx==0.27.0
httpx==0.27.2
# via -r requirements-core.in
idna==3.7
idna==3.8
# via
# anyio
# httpx
Expand All @@ -61,13 +61,13 @@ packaging==24.1 ; sys_platform != 'win32'
# via gunicorn
pycparser==2.22 ; platform_python_implementation != 'PyPy'
# via cffi
pydantic==2.8.2
pydantic==2.9.1
# via
# fastapi-slim
# pydantic-settings
pydantic-core==2.20.1
pydantic-core==2.23.3
# via pydantic
pydantic-settings==2.4.0
pydantic-settings==2.5.1
# via -r requirements-core.in
python-dateutil==2.9.0.post0
# via croniter
Expand All @@ -77,9 +77,9 @@ python-engineio==4.9.1
# via python-socketio
python-multipart==0.0.9
# via -r requirements-core.in
python-socketio==5.11.3
python-socketio==5.11.4
# via -r requirements-core.in
pytz==2024.1
pytz==2024.2
# via croniter
redis==5.0.8
# via -r requirements-core.in
Expand All @@ -91,7 +91,7 @@ sniffio==1.3.1
# via
# anyio
# httpx
starlette==0.38.2
starlette==0.38.5
# via fastapi-slim
typing-extensions==4.12.2
# via
Expand All @@ -104,7 +104,7 @@ uvloop==0.20.0 ; sys_platform != 'win32'
# via -r requirements-core.in
wsproto==1.2.0
# via simple-websocket
xlwings==0.32.1
xlwings==0.32.2
# via -r requirements-core.in

# The following packages were excluded from the output:
Expand Down
38 changes: 19 additions & 19 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ bidict==0.23.1
# via
# -r requirements.txt
# python-socketio
certifi==2024.7.4
certifi==2024.8.30
# via
# -r requirements.txt
# httpcore
# httpx
cffi==1.17.0 ; platform_python_implementation != 'PyPy'
cffi==1.17.1 ; platform_python_implementation != 'PyPy'
# via
# -r requirements.txt
# cryptography
Expand All @@ -42,15 +42,15 @@ colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
# pytest
croniter==3.0.3
# via -r requirements.txt
cryptography==43.0.0
cryptography==43.0.1
# via
# -r requirements.txt
# joserfc
distlib==0.3.8
# via virtualenv
fastapi-slim==0.112.1
fastapi-slim==0.114.1
# via -r requirements.txt
filelock==3.15.4
filelock==3.16.0
# via virtualenv
gunicorn==23.0.0 ; sys_platform != 'win32'
# via -r requirements.txt
Expand All @@ -68,11 +68,11 @@ httpcore==1.0.5
# httpx
httptools==0.6.1
# via -r requirements.txt
httpx==0.27.0
httpx==0.27.2
# via -r requirements.txt
identify==2.6.0
# via pre-commit
idna==3.7
idna==3.8
# via
# -r requirements.txt
# anyio
Expand Down Expand Up @@ -108,7 +108,7 @@ packaging==24.1
# pytest
pandas==2.2.2
# via -r requirements.txt
platformdirs==4.2.2
platformdirs==4.3.2
# via virtualenv
pluggy==1.5.0
# via pytest
Expand All @@ -118,18 +118,18 @@ pycparser==2.22 ; platform_python_implementation != 'PyPy'
# via
# -r requirements.txt
# cffi
pydantic==2.8.2
pydantic==2.9.1
# via
# -r requirements.txt
# fastapi-slim
# pydantic-settings
pydantic-core==2.20.1
pydantic-core==2.23.3
# via
# -r requirements.txt
# pydantic
pydantic-settings==2.4.0
pydantic-settings==2.5.1
# via -r requirements.txt
pytest==8.3.2
pytest==8.3.3
# via
# -r requirements-dev.in
# pytest-mock
Expand All @@ -150,9 +150,9 @@ python-engineio==4.9.1
# python-socketio
python-multipart==0.0.9
# via -r requirements.txt
python-socketio==5.11.3
python-socketio==5.11.4
# via -r requirements.txt
pytz==2024.1
pytz==2024.2
# via
# -r requirements.txt
# croniter
Expand All @@ -176,7 +176,7 @@ sniffio==1.3.1
# httpx
soupsieve==2.6
# via beautifulsoup4
starlette==0.38.2
starlette==0.38.5
# via
# -r requirements.txt
# fastapi-slim
Expand All @@ -190,21 +190,21 @@ tzdata==2024.1
# via
# -r requirements.txt
# pandas
uv==0.3.2
uv==0.4.9
# via -r requirements-dev.in
uvicorn==0.30.6
# via -r requirements.txt
uvloop==0.20.0 ; sys_platform != 'win32'
# via -r requirements.txt
virtualenv==20.26.3
virtualenv==20.26.4
# via pre-commit
watchfiles==0.23.0
watchfiles==0.24.0
# via -r requirements-dev.in
wsproto==1.2.0
# via
# -r requirements.txt
# simple-websocket
xlwings==0.32.1
xlwings==0.32.2
# via -r requirements.txt

# The following packages were excluded from the output:
Expand Down
Loading

0 comments on commit 1fbfb72

Please sign in to comment.