diff --git a/requirements-core-win.txt b/requirements-core-win.txt deleted file mode 100644 index fd5b261..0000000 --- a/requirements-core-win.txt +++ /dev/null @@ -1,103 +0,0 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile requirements-core.in -o requirements-core-win.txt --unsafe-package pywin32 --python-platform windows -aiocache==0.12.2 - # via -r requirements-core.in -annotated-types==0.7.0 - # via pydantic -anyio==4.4.0 - # via - # httpx - # starlette -bidict==0.23.1 - # via python-socketio -certifi==2024.7.4 - # via - # httpcore - # httpx -cffi==1.17.0 - # via cryptography -click==8.1.7 - # via uvicorn -colorama==0.4.6 - # via click -croniter==3.0.3 - # via -r requirements-core.in -cryptography==43.0.0 - # via joserfc -fastapi-slim==0.112.1 - # via -r requirements-core.in -h11==0.14.0 - # via - # httpcore - # uvicorn - # wsproto -hiredis==3.0.0 - # via -r requirements-core.in -httpcore==1.0.5 - # via httpx -httptools==0.6.1 - # via -r requirements-core.in -httpx==0.27.0 - # via -r requirements-core.in -idna==3.7 - # via - # anyio - # httpx -jinja2==3.1.4 - # via - # -r requirements-core.in - # jinja2-fragments -jinja2-fragments==1.5.0 - # via -r requirements-core.in -joserfc==1.0.0 - # via -r requirements-core.in -markupsafe==2.1.5 - # via jinja2 -pycparser==2.22 - # via cffi -pydantic==2.8.2 - # via - # fastapi-slim - # pydantic-settings -pydantic-core==2.20.1 - # via pydantic -pydantic-settings==2.4.0 - # via -r requirements-core.in -python-dateutil==2.9.0.post0 - # via croniter -python-dotenv==1.0.1 - # via pydantic-settings -python-engineio==4.9.1 - # via python-socketio -python-multipart==0.0.9 - # via -r requirements-core.in -python-socketio==5.11.3 - # via -r requirements-core.in -pytz==2024.1 - # via croniter -redis==5.0.8 - # via -r requirements-core.in -simple-websocket==1.0.0 - # via python-engineio -six==1.16.0 - # via python-dateutil -sniffio==1.3.1 - # via - # anyio - # httpx -starlette==0.38.2 - # via fastapi-slim -typing-extensions==4.12.2 - # via - # fastapi-slim - # pydantic - # pydantic-core -uvicorn==0.30.6 - # via -r requirements-core.in -wsproto==1.2.0 - # via simple-websocket -xlwings==0.32.1 - # via -r requirements-core.in - -# The following packages were excluded from the output: -# pywin32 diff --git a/requirements-core.txt b/requirements-core.txt index 8d0c19a..e7bdbbf 100644 --- a/requirements-core.txt +++ b/requirements-core.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile requirements-core.in -o requirements-core.txt --python-platform linux +# uv pip compile requirements-core.in --universal -o requirements-core.txt --unsafe-package pywin32 --unsafe-package appscript --unsafe-package psutil aiocache==0.12.2 # via -r requirements-core.in annotated-types==0.7.0 @@ -14,17 +14,19 @@ certifi==2024.7.4 # via # httpcore # httpx -cffi==1.17.0 +cffi==1.17.0 ; 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 # via joserfc fastapi-slim==0.112.1 # via -r requirements-core.in -gunicorn==23.0.0 +gunicorn==23.0.0 ; sys_platform != 'win32' # via -r requirements-core.in h11==0.14.0 # via @@ -47,15 +49,17 @@ jinja2==3.1.4 # via # -r requirements-core.in # jinja2-fragments -jinja2-fragments==1.5.0 +jinja2-fragments==1.6.0 # via -r requirements-core.in joserfc==1.0.0 # via -r requirements-core.in +lxml==5.3.0 ; platform_system == 'Darwin' + # via appscript markupsafe==2.1.5 # via jinja2 -packaging==24.1 +packaging==24.1 ; sys_platform != 'win32' # via gunicorn -pycparser==2.22 +pycparser==2.22 ; platform_python_implementation != 'PyPy' # via cffi pydantic==2.8.2 # via @@ -96,9 +100,14 @@ typing-extensions==4.12.2 # pydantic-core uvicorn==0.30.6 # via -r requirements-core.in -uvloop==0.20.0 +uvloop==0.20.0 ; sys_platform != 'win32' # via -r requirements-core.in wsproto==1.2.0 # via simple-websocket xlwings==0.32.1 # via -r requirements-core.in + +# The following packages were excluded from the output: +# pywin32 +# appscript +# psutil diff --git a/requirements-dev-win.txt b/requirements-dev-win.txt deleted file mode 100644 index d4dc6cb..0000000 --- a/requirements-dev-win.txt +++ /dev/null @@ -1,206 +0,0 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile requirements-dev.in -o requirements-dev-win.txt --unsafe-package pywin32 --python-platform windows -aiocache==0.12.2 - # via -r requirements.txt -annotated-types==0.7.0 - # via - # -r requirements.txt - # pydantic -anyio==4.4.0 - # via - # -r requirements.txt - # httpx - # starlette - # watchfiles -azure-functions==1.20.0 - # via -r requirements.txt -beautifulsoup4==4.12.3 - # via -r requirements-dev.in -bidict==0.23.1 - # via - # -r requirements.txt - # python-socketio -certifi==2024.7.4 - # via - # -r requirements.txt - # httpcore - # httpx -cffi==1.17.0 - # via - # -r requirements.txt - # cryptography -cfgv==3.4.0 - # via pre-commit -click==8.1.7 - # via - # -r requirements.txt - # uvicorn -colorama==0.4.6 - # via - # click - # pytest -croniter==3.0.3 - # via -r requirements.txt -cryptography==43.0.0 - # via - # -r requirements.txt - # joserfc -distlib==0.3.8 - # via virtualenv -fastapi-slim==0.112.1 - # via -r requirements.txt -filelock==3.15.4 - # via virtualenv -gunicorn==23.0.0 - # via -r requirements.txt -h11==0.14.0 - # via - # -r requirements.txt - # httpcore - # uvicorn - # wsproto -hiredis==3.0.0 - # via -r requirements.txt -httpcore==1.0.5 - # via - # -r requirements.txt - # httpx -httptools==0.6.1 - # via -r requirements.txt -httpx==0.27.0 - # via -r requirements.txt -identify==2.6.0 - # via pre-commit -idna==3.7 - # via - # -r requirements.txt - # anyio - # httpx -iniconfig==2.0.0 - # via pytest -jinja2==3.1.4 - # via - # -r requirements.txt - # jinja2-fragments -jinja2-fragments==1.5.0 - # via -r requirements.txt -joserfc==1.0.0 - # via -r requirements.txt -markupsafe==2.1.5 - # via - # -r requirements.txt - # jinja2 -nodeenv==1.9.1 - # via pre-commit -numpy==2.0.1 - # via - # -r requirements.txt - # pandas -packaging==24.1 - # via - # -r requirements.txt - # gunicorn - # pytest -pandas==2.2.2 - # via -r requirements.txt -platformdirs==4.2.2 - # via virtualenv -pluggy==1.5.0 - # via pytest -pre-commit==3.8.0 - # via -r requirements-dev.in -pycparser==2.22 - # via - # -r requirements.txt - # cffi -pydantic==2.8.2 - # via - # -r requirements.txt - # fastapi-slim - # pydantic-settings -pydantic-core==2.20.1 - # via - # -r requirements.txt - # pydantic -pydantic-settings==2.4.0 - # via -r requirements.txt -pytest==8.3.2 - # via - # -r requirements-dev.in - # pytest-mock -pytest-mock==3.14.0 - # via -r requirements-dev.in -python-dateutil==2.9.0.post0 - # via - # -r requirements.txt - # croniter - # pandas -python-dotenv==1.0.1 - # via - # -r requirements.txt - # pydantic-settings -python-engineio==4.9.1 - # via - # -r requirements.txt - # python-socketio -python-multipart==0.0.9 - # via -r requirements.txt -python-socketio==5.11.3 - # via -r requirements.txt -pytz==2024.1 - # via - # -r requirements.txt - # croniter - # pandas -pyyaml==6.0.2 - # via pre-commit -redis==5.0.8 - # via -r requirements.txt -simple-websocket==1.0.0 - # via - # -r requirements.txt - # python-engineio -six==1.16.0 - # via - # -r requirements.txt - # python-dateutil -sniffio==1.3.1 - # via - # -r requirements.txt - # anyio - # httpx -soupsieve==2.6 - # via beautifulsoup4 -starlette==0.38.2 - # via - # -r requirements.txt - # fastapi-slim -typing-extensions==4.12.2 - # via - # -r requirements.txt - # fastapi-slim - # pydantic - # pydantic-core -tzdata==2024.1 - # via - # -r requirements.txt - # pandas -uv==0.3.0 - # via -r requirements-dev.in -uvicorn==0.30.6 - # via -r requirements.txt -uvloop==0.20.0 - # via -r requirements.txt -virtualenv==20.26.3 - # via pre-commit -watchfiles==0.23.0 - # via -r requirements-dev.in -wsproto==1.2.0 - # via - # -r requirements.txt - # simple-websocket -xlwings==0.32.1 - # via -r requirements.txt - -# The following packages were excluded from the output: -# pywin32 diff --git a/requirements-dev.txt b/requirements-dev.txt index f79585a..f0ff753 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile requirements-dev.in -o requirements-dev.txt --python-platform linux +# uv pip compile requirements-dev.in --universal -o requirements-dev.txt --unsafe-package pywin32 --unsafe-package appscript --unsafe-package psutil aiocache==0.12.2 # via -r requirements.txt annotated-types==0.7.0 @@ -12,7 +12,7 @@ anyio==4.4.0 # httpx # starlette # watchfiles -azure-functions==1.20.0 +azure-functions==1.20.0 ; sys_platform != 'win32' # via -r requirements.txt beautifulsoup4==4.12.3 # via -r requirements-dev.in @@ -25,7 +25,7 @@ certifi==2024.7.4 # -r requirements.txt # httpcore # httpx -cffi==1.17.0 +cffi==1.17.0 ; platform_python_implementation != 'PyPy' # via # -r requirements.txt # cryptography @@ -35,6 +35,11 @@ click==8.1.7 # via # -r requirements.txt # uvicorn +colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows' + # via + # -r requirements.txt + # click + # pytest croniter==3.0.3 # via -r requirements.txt cryptography==43.0.0 @@ -47,7 +52,7 @@ fastapi-slim==0.112.1 # via -r requirements.txt filelock==3.15.4 # via virtualenv -gunicorn==23.0.0 +gunicorn==23.0.0 ; sys_platform != 'win32' # via -r requirements.txt h11==0.14.0 # via @@ -78,10 +83,14 @@ jinja2==3.1.4 # via # -r requirements.txt # jinja2-fragments -jinja2-fragments==1.5.0 +jinja2-fragments==1.6.0 # via -r requirements.txt joserfc==1.0.0 # via -r requirements.txt +lxml==5.3.0 ; platform_system == 'Darwin' + # via + # -r requirements.txt + # appscript markupsafe==2.1.5 # via # -r requirements.txt @@ -105,7 +114,7 @@ pluggy==1.5.0 # via pytest pre-commit==3.8.0 # via -r requirements-dev.in -pycparser==2.22 +pycparser==2.22 ; platform_python_implementation != 'PyPy' # via # -r requirements.txt # cffi @@ -181,11 +190,11 @@ tzdata==2024.1 # via # -r requirements.txt # pandas -uv==0.3.0 +uv==0.3.2 # via -r requirements-dev.in uvicorn==0.30.6 # via -r requirements.txt -uvloop==0.20.0 +uvloop==0.20.0 ; sys_platform != 'win32' # via -r requirements.txt virtualenv==20.26.3 # via pre-commit @@ -197,3 +206,8 @@ wsproto==1.2.0 # simple-websocket xlwings==0.32.1 # via -r requirements.txt + +# The following packages were excluded from the output: +# pywin32 +# appscript +# psutil diff --git a/requirements-win.txt b/requirements-win.txt deleted file mode 100644 index c6449f1..0000000 --- a/requirements-win.txt +++ /dev/null @@ -1,162 +0,0 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile requirements.in -o requirements-win.txt --unsafe-package pywin32 --python-platform windows -aiocache==0.12.2 - # via -r requirements-core.txt -annotated-types==0.7.0 - # via - # -r requirements-core.txt - # pydantic -anyio==4.4.0 - # via - # -r requirements-core.txt - # httpx - # starlette -bidict==0.23.1 - # via - # -r requirements-core.txt - # python-socketio -certifi==2024.7.4 - # via - # -r requirements-core.txt - # httpcore - # httpx -cffi==1.17.0 - # via - # -r requirements-core.txt - # cryptography -click==8.1.7 - # via - # -r requirements-core.txt - # uvicorn -colorama==0.4.6 - # via click -croniter==3.0.3 - # via -r requirements-core.txt -cryptography==43.0.0 - # via - # -r requirements-core.txt - # joserfc -fastapi-slim==0.112.1 - # via -r requirements-core.txt -gunicorn==23.0.0 - # via -r requirements-core.txt -h11==0.14.0 - # via - # -r requirements-core.txt - # httpcore - # uvicorn - # wsproto -hiredis==3.0.0 - # via -r requirements-core.txt -httpcore==1.0.5 - # via - # -r requirements-core.txt - # httpx -httptools==0.6.1 - # via -r requirements-core.txt -httpx==0.27.0 - # via -r requirements-core.txt -idna==3.7 - # via - # -r requirements-core.txt - # anyio - # httpx -jinja2==3.1.4 - # via - # -r requirements-core.txt - # jinja2-fragments -jinja2-fragments==1.5.0 - # via -r requirements-core.txt -joserfc==1.0.0 - # via -r requirements-core.txt -markupsafe==2.1.5 - # via - # -r requirements-core.txt - # jinja2 -numpy==2.0.1 - # via - # -r requirements.in - # pandas -packaging==24.1 - # via - # -r requirements-core.txt - # gunicorn -pandas==2.2.2 - # via -r requirements.in -pycparser==2.22 - # via - # -r requirements-core.txt - # cffi -pydantic==2.8.2 - # via - # -r requirements-core.txt - # fastapi-slim - # pydantic-settings -pydantic-core==2.20.1 - # via - # -r requirements-core.txt - # pydantic -pydantic-settings==2.4.0 - # via -r requirements-core.txt -python-dateutil==2.9.0.post0 - # via - # -r requirements-core.txt - # croniter - # pandas -python-dotenv==1.0.1 - # via - # -r requirements-core.txt - # pydantic-settings -python-engineio==4.9.1 - # via - # -r requirements-core.txt - # python-socketio -python-multipart==0.0.9 - # via -r requirements-core.txt -python-socketio==5.11.3 - # via -r requirements-core.txt -pytz==2024.1 - # via - # -r requirements-core.txt - # croniter - # pandas -redis==5.0.8 - # via -r requirements-core.txt -simple-websocket==1.0.0 - # via - # -r requirements-core.txt - # python-engineio -six==1.16.0 - # via - # -r requirements-core.txt - # python-dateutil -sniffio==1.3.1 - # via - # -r requirements-core.txt - # anyio - # httpx -starlette==0.38.2 - # via - # -r requirements-core.txt - # fastapi-slim -typing-extensions==4.12.2 - # via - # -r requirements-core.txt - # fastapi-slim - # pydantic - # pydantic-core -tzdata==2024.1 - # via pandas -uvicorn==0.30.6 - # via -r requirements-core.txt -uvloop==0.20.0 - # via -r requirements-core.txt -wsproto==1.2.0 - # via - # -r requirements-core.txt - # simple-websocket -xlwings==0.32.1 - # via -r requirements-core.txt - -# The following packages were excluded from the output: -# pywin32 diff --git a/requirements.txt b/requirements.txt index 493d294..a105ab4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile requirements.in -o requirements.txt --python-platform linux +# uv pip compile requirements.in --universal -o requirements.txt --unsafe-package pywin32 --unsafe-package appscript --unsafe-package psutil aiocache==0.12.2 # via -r requirements-core.txt annotated-types==0.7.0 @@ -11,7 +11,7 @@ anyio==4.4.0 # -r requirements-core.txt # httpx # starlette -azure-functions==1.20.0 +azure-functions==1.20.0 ; sys_platform != 'win32' # via -r requirements.in bidict==0.23.1 # via @@ -22,7 +22,7 @@ certifi==2024.7.4 # -r requirements-core.txt # httpcore # httpx -cffi==1.17.0 +cffi==1.17.0 ; platform_python_implementation != 'PyPy' # via # -r requirements-core.txt # cryptography @@ -30,6 +30,10 @@ click==8.1.7 # via # -r requirements-core.txt # uvicorn +colorama==0.4.6 ; platform_system == 'Windows' + # via + # -r requirements-core.txt + # click croniter==3.0.3 # via -r requirements-core.txt cryptography==43.0.0 @@ -38,7 +42,7 @@ cryptography==43.0.0 # joserfc fastapi-slim==0.112.1 # via -r requirements-core.txt -gunicorn==23.0.0 +gunicorn==23.0.0 ; sys_platform != 'win32' # via -r requirements-core.txt h11==0.14.0 # via @@ -65,10 +69,14 @@ jinja2==3.1.4 # via # -r requirements-core.txt # jinja2-fragments -jinja2-fragments==1.5.0 +jinja2-fragments==1.6.0 # via -r requirements-core.txt joserfc==1.0.0 # via -r requirements-core.txt +lxml==5.3.0 ; platform_system == 'Darwin' + # via + # -r requirements-core.txt + # appscript markupsafe==2.1.5 # via # -r requirements-core.txt @@ -77,13 +85,13 @@ numpy==2.0.1 # via # -r requirements.in # pandas -packaging==24.1 +packaging==24.1 ; sys_platform != 'win32' # via # -r requirements-core.txt # gunicorn pandas==2.2.2 # via -r requirements.in -pycparser==2.22 +pycparser==2.22 ; platform_python_implementation != 'PyPy' # via # -r requirements-core.txt # cffi @@ -149,7 +157,7 @@ tzdata==2024.1 # via pandas uvicorn==0.30.6 # via -r requirements-core.txt -uvloop==0.20.0 +uvloop==0.20.0 ; sys_platform != 'win32' # via -r requirements-core.txt wsproto==1.2.0 # via @@ -157,3 +165,8 @@ wsproto==1.2.0 # simple-websocket xlwings==0.32.1 # via -r requirements-core.txt + +# The following packages were excluded from the output: +# pywin32 +# appscript +# psutil diff --git a/run.py b/run.py index 5519823..9882731 100644 --- a/run.py +++ b/run.py @@ -67,10 +67,8 @@ def deps_compile(upgrade=False): # The order of how these files matters because they are all interdependent file_names = ["requirements-core", "requirements", "requirements-dev"] for file_name in file_names: - cmd_linux = f"uv pip compile {file_name}.in -o {file_name}.txt --python-platform linux {'--upgrade' if upgrade else ''}" - cmd_win = f"uv pip compile {file_name}.in -o {file_name}-win.txt --unsafe-package pywin32 --python-platform windows {'--upgrade' if upgrade else ''}" - for cmd in [cmd_linux, cmd_win]: - subprocess.run(cmd, shell=True, check=True) + cmd_linux = f"uv pip compile {file_name}.in --universal -o {file_name}.txt --unsafe-package pywin32 --unsafe-package appscript --unsafe-package psutil {'--upgrade' if upgrade else ''}" + subprocess.run(cmd_linux, shell=True, check=True) print( f"Success! Requirements files {'upgraded' if upgrade else 'compiled'} successfully. Now commit the requirements.txt files!" )